projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
nct6775.c
diff --git
a/drivers/hwmon/nct6775.c
b/drivers/hwmon/nct6775.c
index 38d5a63340535567719feb35338712570a2c88d2..59d9a3fc96b70cd828c29b66ced2021ceeaa9ca4 100644
(file)
--- 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;
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,
}
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:
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])
if (pdev[i])
- platform_device_
put
(pdev[i]);
+ platform_device_
unregister
(pdev[i]);
}
exit_unregister:
platform_driver_unregister(&nct6775_driver);
}
exit_unregister:
platform_driver_unregister(&nct6775_driver);