On Sat, Feb 26, 2011 at 03:54:57PM +0300, Dan Carpenter wrote:
> 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@xxxxxxxxx>
Acked-by: Mattia Dongili <malattia@xxxxxxxx>
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index a7b9c72..d0d0522 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -1593,9 +1593,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);
--
mattia
:wq!
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
