Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcf65cd4 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

sonypi: fit input devices into sysfs tree 



Properly set up parent on input devices registered by sonypi.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarMattia Dongili <malattia@linux.it>
parent 2e4d242c

drivers/char/sonypi.c

+4 −2
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ static struct acpi_driver sonypi_acpi_driver = { 
};

#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_devices(void) 
	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_devices(void) 
	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 platform_device *dev) 


	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");