aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2007-11-05 11:43:29 -0500
committerLen Brown <len.brown@intel.com>2007-11-14 11:48:51 -0500
commit91c05c667b2d8e43e0bbc5f269bf45d4821001d6 (patch)
tree5a2f7f3da16f8a55f7098d72cc95a2a0f0cbd15a /drivers/acpi
parent9418d5dc9ba40b88737580457bf3b7c63c60ec43 (diff)
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.c3
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)
1961 input->phys = video->phys; 1961 input->phys = video->phys;
1962 input->id.bustype = BUS_HOST; 1962 input->id.bustype = BUS_HOST;
1963 input->id.product = 0x06; 1963 input->id.product = 0x06;
1964 input->dev.parent = &device->dev;
1964 input->evbit[0] = BIT(EV_KEY); 1965 input->evbit[0] = BIT(EV_KEY);
1965 set_bit(KEY_SWITCHVIDEOMODE, input->keybit); 1966 set_bit(KEY_SWITCHVIDEOMODE, input->keybit);
1966 set_bit(KEY_VIDEO_NEXT, input->keybit); 1967 set_bit(KEY_VIDEO_NEXT, input->keybit);
@@ -1990,7 +1991,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
1990 video->flags.rom ? "yes" : "no", 1991 video->flags.rom ? "yes" : "no",
1991 video->flags.post ? "yes" : "no"); 1992 video->flags.post ? "yes" : "no");
1992 1993
1993 end: 1994 end:
1994 if (result) 1995 if (result)
1995 kfree(video); 1996 kfree(video);
1996 1997