luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sonypi: fit input devices into sysfs tree

Browse Source 
Properly set up parent on input devices registered by sonypi.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Mattia Dongili <malattia@linux.it>
This commit is contained in:
Dmitry Torokhov 2007-11-21 14:16:16 -05:00
parent 2e4d242ce7
commit dcf65cd41c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/sonypi.c
View File

@ -1163,7 +1163,7 @@ static struct acpi_driver sonypi_acpi_driver = {
}; };
#endif #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 *jog_dev;
struct input_dev *key_dev; struct input_dev *key_dev;
@ -1177,6 +1177,7 @@ static int __devinit sonypi_create_input_devices(void)
jog_dev->name = "Sony Vaio Jogdial"; jog_dev->name = "Sony Vaio Jogdial";
jog_dev->id.bustype = BUS_ISA; jog_dev->id.bustype = BUS_ISA;
jog_dev->id.vendor = PCI_VENDOR_ID_SONY; 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->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE); jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
@ -1191,6 +1192,7 @@ static int __devinit sonypi_create_input_devices(void)
key_dev->name = "Sony Vaio Keys"; key_dev->name = "Sony Vaio Keys";
key_dev->id.bustype = BUS_ISA; key_dev->id.bustype = BUS_ISA;
key_dev->id.vendor = PCI_VENDOR_ID_SONY; key_dev->id.vendor = PCI_VENDOR_ID_SONY;
key_dev->dev.parent = &pdev->dev;
/* Initialize the Input Drivers: special keys */ /* Initialize the Input Drivers: special keys */
key_dev->evbit[0] = BIT_MASK(EV_KEY); key_dev->evbit[0] = BIT_MASK(EV_KEY);
@ -1385,7 +1387,7 @@ static int __devinit sonypi_probe(struct platform_device *dev)
if (useinput) { if (useinput) {
error = sonypi_create_input_devices(); error = sonypi_create_input_devices(dev);
if (error) { if (error) {
printk(KERN_ERR printk(KERN_ERR
"sonypi: failed to create input devices\n"); "sonypi: failed to create input devices\n");