---

yaml --- r: 367608 b: refs/heads/master c: f0c2958 h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 04514cd · 04514cd
1 parent 8675b97
commit 04514cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 994fa63c5b126df6e9f31ef4e09000e2e243234b
+refs/heads/master: f0c29583db51104a7bc223b1e9c88d818f24ba4d
diff --git a/trunk/drivers/acpi/fan.c b/trunk/drivers/acpi/fan.c
@@ -174,9 +174,13 @@ static int acpi_fan_add(struct acpi_device *device)
 
 static int acpi_fan_remove(struct acpi_device *device)
 {
-	struct thermal_cooling_device *cdev = acpi_driver_data(device);
+	struct thermal_cooling_device *cdev;
+
+	if (!device)
+		return -EINVAL;
 
-	if (!device || !cdev)
+	cdev =  acpi_driver_data(device);
+	if (!cdev)
 		return -EINVAL;
 
 	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");