From f178dcdf2ae75918de058ca6906c72245265a82c Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Sat, 4 Apr 2009 09:33:34 +0100
Subject: [PATCH] --- yaml --- r: 141923 b: refs/heads/master c:
 350e32907cf72ef82bbe7d72525fa2d9dcf64682 h: refs/heads/master i:   141921:
 f72acbd666e7c09fb9ea8d9443571d3513c7466c   141919:
 810cae64dc9cf7b8eb9cfff99344a10122381248 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/platform/x86/acer-wmi.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0118fac56bfb..3d877d5db1d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a74dd5fdabcd34c93e17e9c7024eeb503c92b048
+refs/heads/master: 350e32907cf72ef82bbe7d72525fa2d9dcf64682
diff --git a/trunk/drivers/platform/x86/acer-wmi.c b/trunk/drivers/platform/x86/acer-wmi.c
index 60fbef283e73..27837e8ae51d 100644
--- a/trunk/drivers/platform/x86/acer-wmi.c
+++ b/trunk/drivers/platform/x86/acer-wmi.c
@@ -1136,11 +1136,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;
 }