]> err.no Git - linux-2.6/commitdiff
hwmon/f71805f: Fix a race condition
authorJean Delvare <khali@linux-fr.org>
Wed, 14 Feb 2007 20:15:05 +0000 (21:15 +0100)
committerJean Delvare <khali@arrakis.delvare>
Wed, 14 Feb 2007 20:15:05 +0000 (21:15 +0100)
I think I introduced a potential race condition bug with commit
51c997d80e1f625aea3426a8a9087f5830ac6db3. I didn't realize it
back then, but platform_device_put and platform_device_release
both appear to free the platform data associated with the device.
This makes an explicit kfree redundant at best, and maybe even
racy, as it might occur while someone still holds a reference
to the platform device.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/hwmon/f71805f.c

index 2fc537819388e737439f03af67822139032df312..7c2973487122cd139b22081225cbcbefefa28bae 100644 (file)
@@ -1290,14 +1290,11 @@ static int __init f71805f_device_add(unsigned short address,
        if (err) {
                printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
                       err);
-               goto exit_kfree_data;
+               goto exit_device_put;
        }
 
        return 0;
 
-exit_kfree_data:
-       kfree(pdev->dev.platform_data);
-       pdev->dev.platform_data = NULL;
 exit_device_put:
        platform_device_put(pdev);
 exit:
@@ -1390,10 +1387,7 @@ exit:
 
 static void __exit f71805f_exit(void)
 {
-       kfree(pdev->dev.platform_data);
-       pdev->dev.platform_data = NULL;
        platform_device_unregister(pdev);
-
        platform_driver_unregister(&f71805f_driver);
 }