From e740930c61290fbeeae57129f3a7877d46bc2138 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 26 Feb 2011 15:54:57 +0300 Subject: [PATCH] --- yaml --- r: 243118 b: refs/heads/master c: 7227dedbc22f66f1bd310c866053b08de0496e38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/sony-laptop.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d7545aa54097..86f9d7f03946 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f11113b22cd84b0adc355eaaa80be433005f5f45 +refs/heads/master: 7227dedbc22f66f1bd310c866053b08de0496e38 diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c index 60d83343fb01..363b89ef61cc 100644 --- a/trunk/drivers/platform/x86/sony-laptop.c +++ b/trunk/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);