diff options
| author | Axel Lin <axel.lin@ingics.com> | 2014-05-24 23:21:23 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-05-24 08:30:29 -0700 |
| commit | 9d311eddf3565ed0e05b3cb5a22db41fa74d9d86 (patch) | |
| tree | ffd5f8cb949f8b1c347f93589cad4b295cea8f38 | |
| parent | 30190c3c6181470203e6f635166496aa640ffe06 (diff) | |
| download | linux-9d311eddf3565ed0e05b3cb5a22db41fa74d9d86.tar.gz linux-9d311eddf3565ed0e05b3cb5a22db41fa74d9d86.tar.bz2 linux-9d311eddf3565ed0e05b3cb5a22db41fa74d9d86.zip | |
hwmon: (nct6775) Fix probe unwind paths to properly unregister platform devices
Call platform_device_unregister() rather than platform_device_put() to
unregister successfully registered platform devices.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | drivers/hwmon/nct6775.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 38d5a6334053..59d9a3fc96b7 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -4160,7 +4160,7 @@ static int __init sensors_nct6775_init(void) pdev[i] = platform_device_alloc(DRVNAME, address); if (!pdev[i]) { err = -ENOMEM; - goto exit_device_put; + goto exit_device_unregister; } err = platform_device_add_data(pdev[i], &sio_data, @@ -4198,9 +4198,11 @@ static int __init sensors_nct6775_init(void) return 0; exit_device_put: - for (i = 0; i < ARRAY_SIZE(pdev); i++) { + platform_device_put(pdev[i]); +exit_device_unregister: + while (--i >= 0) { if (pdev[i]) - platform_device_put(pdev[i]); + platform_device_unregister(pdev[i]); } exit_unregister: platform_driver_unregister(&nct6775_driver); |