[PATCH 2/3] acer-wmi: Cleanup the failure cleanup handling

Carlos Corbacho
2009-04-04T08:20:42Z

From: Andy Whitcroft <apw@canonical.com>

Cleanup the failure cleanup handling for brightness and email led.

[cc: Split out from another patch]

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

drivers/platform/x86/acer-wmi.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 61d02f9..bfba6f7 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1138,11 +1138,17 @@ static int __devinit acer_platform_probe(struct platform_device *device)
}

err = acer_rfkill_init(&device->dev);
+ if (err)
+ goto error_rfkill;

return err;

+error_rfkill:
+ if (has_cap(ACER_CAP_BRIGHTNESS))
+ acer_backlight_exit();
error_brightness:
- acer_led_exit();
+ if (has_cap(ACER_CAP_MAILLED))
+ acer_led_exit();
error_mailled:
return err;
}