summaryrefslogtreecommitdiff
path: root/drivers/platform/x86/fujitsu-laptop.c
diff options
context:
space:
mode:
authorMichał Kępień <kernel@kempniu.pl>2017-04-07 16:07:13 +0300
committerDarren Hart (VMware) <dvhart@infradead.org>2017-04-19 22:57:32 +0300
commitd1c7073bce91fec5af71a8026636a0735f0c867c (patch)
tree79a4c0b460be4bbe04983ac187ec42f85efbfa5d /drivers/platform/x86/fujitsu-laptop.c
parent30943e1484aab78d83ddfb706bca65c5d8092bfb (diff)
downloadlinux-d1c7073bce91fec5af71a8026636a0735f0c867c.tar.xz
platform/x86: fujitsu-laptop: simplify error handling in acpi_fujitsu_laptop_add()
As LED class devices registered by fujitsu-laptop no longer depend on the platform device, two function calls inside acpi_fujitsu_laptop_add() can be rearranged in order to simplify error handling. 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>
Diffstat (limited to 'drivers/platform/x86/fujitsu-laptop.c')
-rw-r--r--drivers/platform/x86/fujitsu-laptop.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 7d0d1e046d21..7f49d92914c9 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -845,18 +845,16 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK;
}
- error = fujitsu_laptop_platform_add();
+ error = acpi_fujitsu_laptop_leds_register(device);
if (error)
goto err_free_fifo;
- error = acpi_fujitsu_laptop_leds_register(device);
+ error = fujitsu_laptop_platform_add();
if (error)
- goto err_remove_platform_device;
+ goto err_free_fifo;
return 0;
-err_remove_platform_device:
- fujitsu_laptop_platform_remove();
err_free_fifo:
kfifo_free(&fujitsu_laptop->fifo);
err_stop: