]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
hwmon/f71882fg: Set platform drvdata to NULL later
authorHans de Goede <hdegoede@redhat.com>
Sun, 13 Mar 2011 12:50:33 +0000 (13:50 +0100)
committerGuenter Roeck <guenter.roeck@ericsson.com>
Sun, 13 Mar 2011 14:42:52 +0000 (07:42 -0700)
This avoids a possible race leading to trying to dereference NULL.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@kernel.org
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
drivers/hwmon/f71882fg.c

index ed04f07410fb4504fc45be2a88e5d1659e1958b5..6e06019015a5cf5644458fc62b061899eb1488b5 100644 (file)
@@ -2111,7 +2111,6 @@ static int f71882fg_remove(struct platform_device *pdev)
        int nr_fans = (data->type == f71882fg) ? 4 : 3;
        u8 start_reg = f71882fg_read8(data, F71882FG_REG_START);
 
        int nr_fans = (data->type == f71882fg) ? 4 : 3;
        u8 start_reg = f71882fg_read8(data, F71882FG_REG_START);
 
-       platform_set_drvdata(pdev, NULL);
        if (data->hwmon_dev)
                hwmon_device_unregister(data->hwmon_dev);
 
        if (data->hwmon_dev)
                hwmon_device_unregister(data->hwmon_dev);
 
@@ -2178,6 +2177,7 @@ static int f71882fg_remove(struct platform_device *pdev)
                }
        }
 
                }
        }
 
+       platform_set_drvdata(pdev, NULL);
        kfree(data);
 
        return 0;
        kfree(data);
 
        return 0;