diff options
author | Dan Carpenter <error27@gmail.com> | 2011-02-26 07:54:57 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:07:25 -0400 |
commit | 7227dedbc22f66f1bd310c866053b08de0496e38 (patch) | |
tree | d6abcf6031bca9d042dfba9d4e0088f7cdf55891 /drivers/platform | |
parent | f11113b22cd84b0adc355eaaa80be433005f5f45 (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/platform')
-rw-r--r-- | drivers/platform/x86/sony-laptop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 60d83343fb01..363b89ef61cc 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) | |||
1594 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00", | 1594 | if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00", |
1595 | &handle))) { | 1595 | &handle))) { |
1596 | dprintk("Doing SNC setup\n"); | 1596 | dprintk("Doing SNC setup\n"); |
1597 | if (sony_nc_handles_setup(sony_pf_device)) | 1597 | result = sony_nc_handles_setup(sony_pf_device); |
1598 | if (result) | ||
1598 | goto outpresent; | 1599 | goto outpresent; |
1599 | if (sony_nc_kbd_backlight_setup(sony_pf_device)) | 1600 | result = sony_nc_kbd_backlight_setup(sony_pf_device); |
1601 | if (result) | ||
1600 | goto outsnc; | 1602 | goto outsnc; |
1601 | sony_nc_function_setup(device); | 1603 | sony_nc_function_setup(device); |
1602 | sony_nc_rfkill_setup(device); | 1604 | sony_nc_rfkill_setup(device); |