summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-02-26 15:54:57 +0300
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:07:25 -0400
commit7227dedbc22f66f1bd310c866053b08de0496e38 (patch)
treed6abcf6031bca9d042dfba9d4e0088f7cdf55891 /drivers
parentf11113b22cd84b0adc355eaaa80be433005f5f45 (diff)
sony-laptop: return negative on failure in sony_nc_add()
There were two places in sony_nc_add() where we returned zero on failure instead of a negative error code. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/sony-laptop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 60d83343fb0..363b89ef61c 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1594,9 +1594,11 @@ static int sony_nc_add(struct acpi_device *device)
if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00",
&handle))) {
dprintk("Doing SNC setup\n");
- if (sony_nc_handles_setup(sony_pf_device))
+ result = sony_nc_handles_setup(sony_pf_device);
+ if (result)
goto outpresent;
- if (sony_nc_kbd_backlight_setup(sony_pf_device))
+ result = sony_nc_kbd_backlight_setup(sony_pf_device);
+ if (result)
goto outsnc;
sony_nc_function_setup(device);
sony_nc_rfkill_setup(device);