diff --git a/[refs] b/[refs]
index 17cd7ca29a9e..cb92e9dc4d84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ac16967b8de55ec1cfb596717b3a68b0d5b42f7
+refs/heads/master: 60955f15d93198ef33081e01f46223c7bd534f1e
diff --git a/trunk/drivers/staging/quickstart/quickstart.c b/trunk/drivers/staging/quickstart/quickstart.c
index 3bae5e756598..de98e18f9b4c 100644
--- a/trunk/drivers/staging/quickstart/quickstart.c
+++ b/trunk/drivers/staging/quickstart/quickstart.c
@@ -309,13 +309,15 @@ static int quickstart_acpi_add(struct acpi_device *device)
 
 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);