Merge tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into...

[linux-2.6-microblaze.git] / drivers / acpi / fan.c

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index f815da8..8d1c010 100644 (file)
--- a/drivers/acpi/fan.c
+++ b/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");