On Wed, Oct 31, 2007 at 12:43:10AM -0400, Dmitry Torokhov wrote:
> Subject: Sonypi: fit input devices into sysfs tree
> From: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
>
> Properly set up parent on input devices registered by sonypi.
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
Acked-by: Mattia Dongili <malattia@xxxxxxxx>
> ---
> drivers/char/sonypi.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> Index: linux/drivers/char/sonypi.c
> ===================================================================
> --- linux.orig/drivers/char/sonypi.c
> +++ linux/drivers/char/sonypi.c
> @@ -1163,7 +1163,7 @@ static struct acpi_driver sonypi_acpi_dr
> };
> #endif
>
> -static int __devinit sonypi_create_input_devices(void)
> +static int __devinit sonypi_create_input_devices(struct platform_device *pdev)
> {
> struct input_dev *jog_dev;
> struct input_dev *key_dev;
> @@ -1177,6 +1177,7 @@ static int __devinit sonypi_create_input
> jog_dev->name = "Sony Vaio Jogdial";
> jog_dev->id.bustype = BUS_ISA;
> jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
> + jog_dev->dev.parent = &pdev->dev;
>
> jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
> jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
> @@ -1191,6 +1192,7 @@ static int __devinit sonypi_create_input
> key_dev->name = "Sony Vaio Keys";
> key_dev->id.bustype = BUS_ISA;
> key_dev->id.vendor = PCI_VENDOR_ID_SONY;
> + key_dev->dev.parent = &pdev->dev;
>
> /* Initialize the Input Drivers: special keys */
> key_dev->evbit[0] = BIT_MASK(EV_KEY);
> @@ -1385,7 +1387,7 @@ static int __devinit sonypi_probe(struct
>
> if (useinput) {
>
> - error = sonypi_create_input_devices();
> + error = sonypi_create_input_devices(dev);
> if (error) {
> printk(KERN_ERR
> "sonypi: failed to create input devices\n");
>
--
mattia
:wq!
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
