From 3b21c74dd1c7bac05d675a1f5e763a8ec7bb0356 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Wed, 19 Aug 2009 15:06:47 +0100
Subject: [PATCH] --- yaml --- r: 177527 b: refs/heads/master c:
 71e9dc73cb6b1351bdd5f732cef5dbef411b3219 h: refs/heads/master i:   177525:
 7ca9076a164fbb00685a7e6d559a5b0117f4f763   177523:
 33d07a4222191466ccd098f0a0a27b5e2cd1d4aa   177519:
 6f6a4a7e1560db9338c353f0295461df2f415a98 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/platform/x86/dell-laptop.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 48420758f70a..35e58ef6ff91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1fbf346c7c56d6b2f9d835d297bcb088baaff3a
+refs/heads/master: 71e9dc73cb6b1351bdd5f732cef5dbef411b3219
diff --git a/trunk/drivers/platform/x86/dell-laptop.c b/trunk/drivers/platform/x86/dell-laptop.c
index 906111152b03..d791ef93c1f0 100644
--- a/trunk/drivers/platform/x86/dell-laptop.c
+++ b/trunk/drivers/platform/x86/dell-laptop.c
@@ -330,7 +330,7 @@ static int __init dell_init(void)
 
 	if (ret) {
 		printk(KERN_WARNING "dell-laptop: Unable to setup rfkill\n");
-		goto out;
+		goto fail_rfkill;
 	}
 
 #ifdef CONFIG_ACPI
@@ -358,7 +358,7 @@ static int __init dell_init(void)
 		if (IS_ERR(dell_backlight_device)) {
 			ret = PTR_ERR(dell_backlight_device);
 			dell_backlight_device = NULL;
-			goto out;
+			goto fail_backlight;
 		}
 
 		dell_backlight_device->props.max_brightness = max_intensity;
@@ -368,13 +368,15 @@ static int __init dell_init(void)
 	}
 
 	return 0;
-out:
+
+fail_backlight:
 	if (wifi_rfkill)
 		rfkill_unregister(wifi_rfkill);
 	if (bluetooth_rfkill)
 		rfkill_unregister(bluetooth_rfkill);
 	if (wwan_rfkill)
 		rfkill_unregister(wwan_rfkill);
+fail_rfkill:
 	kfree(da_tokens);
 	return ret;
 }