From: Szymon Janc <szymon@janc.net.pl>
Date: Wed, 11 Jan 2012 22:22:41 +0000 (+0100)
Subject: Staging: quickstart: Cleanup quickstart_acpi_remove
X-Git-Tag: v3.4-rc1~186^2~176^2~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60955f15d93198ef33081e01f46223c7bd534f1e;p=thirdparty%2Fkernel%2Flinux.git

Staging: quickstart: Cleanup quickstart_acpi_remove

Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c
index 3bae5e7565983..de98e18f9b4cc 100644
--- a/drivers/staging/quickstart/quickstart.c
+++ b/drivers/staging/quickstart/quickstart.c
@@ -309,13 +309,15 @@ fail_config:
 
 static int quickstart_acpi_remove(struct acpi_device *device, int type)
 {
-	acpi_status status = 0;
-	struct quickstart_acpi *quickstart = NULL;
+	acpi_status status;
+	struct quickstart_acpi *quickstart;
 
-	if (!device || !acpi_driver_data(device))
+	if (!device)
 		return -EINVAL;
 
 	quickstart = acpi_driver_data(device);
+	if (!quickstart)
+		return -EINVAL;
 
 	status = acpi_remove_notify_handler(device->handle, ACPI_ALL_NOTIFY,
 						quickstart_acpi_notify);