leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

platform/x86: fujitsu-laptop: Defer input device registration

Browse Source 
Only register input devices after the device-specific data structures
they access are fully initialized.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
Michał Kępień 2018-02-11 22:07:22 +01:00 committed by Darren Hart (VMware)
parent 14966e0277
commit a7a1ccbee3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/platform/x86/fujitsu-laptop.c
View File

@ -399,10 +399,6 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
strcpy(acpi_device_class(device), ACPI_FUJITSU_CLASS); strcpy(acpi_device_class(device), ACPI_FUJITSU_CLASS);
device->driver_data = priv; device->driver_data = priv;
ret = acpi_fujitsu_bl_input_setup(device);
if (ret)
return ret;
pr_info("ACPI: %s [%s]\n", pr_info("ACPI: %s [%s]\n",
acpi_device_name(device), acpi_device_bid(device)); acpi_device_name(device), acpi_device_bid(device));
@ -410,6 +406,10 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
priv->max_brightness = FUJITSU_LCD_N_LEVELS; priv->max_brightness = FUJITSU_LCD_N_LEVELS;
get_lcd_level(device); get_lcd_level(device);
ret = acpi_fujitsu_bl_input_setup(device);
if (ret)
return ret;
ret = fujitsu_backlight_register(device); ret = fujitsu_backlight_register(device);
if (ret) if (ret)
return ret; return ret;
@ -795,10 +795,6 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
goto err_stop; goto err_stop;
} }
ret = acpi_fujitsu_laptop_input_setup(device);
if (ret)
goto err_free_fifo;
pr_info("ACPI: %s [%s]\n", pr_info("ACPI: %s [%s]\n",
acpi_device_name(device), acpi_device_bid(device)); acpi_device_name(device), acpi_device_bid(device));
@ -833,6 +829,10 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK; fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK;
} }
ret = acpi_fujitsu_laptop_input_setup(device);
if (ret)
goto err_free_fifo;
ret = acpi_fujitsu_laptop_leds_register(device); ret = acpi_fujitsu_laptop_leds_register(device);
if (ret) if (ret)
goto err_free_fifo; goto err_free_fifo;