diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-11-05 17:43:29 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-14 17:48:51 +0100 |
| commit | 91c05c667b2d8e43e0bbc5f269bf45d4821001d6 (patch) | |
| tree | 5a2f7f3da16f8a55f7098d72cc95a2a0f0cbd15a /drivers/acpi | |
| parent | Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 (diff) | |
| download | linux-91c05c667b2d8e43e0bbc5f269bf45d4821001d6.tar.xz linux-91c05c667b2d8e43e0bbc5f269bf45d4821001d6.zip | |
ACPI: video - fit input device into sysfs tree
Properly set up parent on input device registered by the video driver.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index bac956b30c57..c0e4e7423fcd 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1961,6 +1961,7 @@ static int acpi_video_bus_add(struct acpi_device *device) input->phys = video->phys; input->id.bustype = BUS_HOST; input->id.product = 0x06; + input->dev.parent = &device->dev; input->evbit[0] = BIT(EV_KEY); set_bit(KEY_SWITCHVIDEOMODE, input->keybit); set_bit(KEY_VIDEO_NEXT, input->keybit); @@ -1990,7 +1991,7 @@ static int acpi_video_bus_add(struct acpi_device *device) video->flags.rom ? "yes" : "no", video->flags.post ? "yes" : "no"); - end: + end: if (result) kfree(video); |