]> err.no Git - linux-2.6/commitdiff
ACPI: video - fit input device into sysfs tree
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 5 Nov 2007 16:43:29 +0000 (11:43 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 14 Nov 2007 16:48:51 +0000 (11:48 -0500)
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>
drivers/acpi/video.c

index bac956b30c57b94fafe71c951331723122bbd926..c0e4e7423fcd68246a7278ec638079ad760ac930 100644 (file)
@@ -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);