Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dcf65cd41c980278f98b6fc0d9da52747e7d058f

Authored by Dmitry Torokhov
1 parent 2e4d242ce7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sonypi: fit input devices into sysfs tree 

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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/char/sonypi.c
Diff comments   View file @ dcf65cd
... ... @@ -1163,7 +1163,7 @@
1163 1163 };
1164 1164 #endif
1165 1165  
1166   -static int __devinit sonypi_create_input_devices(void)
  1166 +static int __devinit sonypi_create_input_devices(struct platform_device *pdev)
1167 1167 {
1168 1168 struct input_dev *jog_dev;
1169 1169 struct input_dev *key_dev;
... ... @@ -1177,6 +1177,7 @@
1177 1177 jog_dev->name = "Sony Vaio Jogdial";
1178 1178 jog_dev->id.bustype = BUS_ISA;
1179 1179 jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
  1180 + jog_dev->dev.parent = &pdev->dev;
1180 1181  
1181 1182 jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
1182 1183 jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
... ... @@ -1191,6 +1192,7 @@
1191 1192 key_dev->name = "Sony Vaio Keys";
1192 1193 key_dev->id.bustype = BUS_ISA;
1193 1194 key_dev->id.vendor = PCI_VENDOR_ID_SONY;
  1195 + key_dev->dev.parent = &pdev->dev;
1194 1196  
1195 1197 /* Initialize the Input Drivers: special keys */
1196 1198 key_dev->evbit[0] = BIT_MASK(EV_KEY);
... ... @@ -1385,7 +1387,7 @@
1385 1387  
1386 1388 if (useinput) {
1387 1389  
1388   - error = sonypi_create_input_devices();
  1390 + error = sonypi_create_input_devices(dev);
1389 1391 if (error) {
1390 1392 printk(KERN_ERR
1391 1393 "sonypi: failed to create input devices\n");