diff options
| -rw-r--r-- | drivers/hwmon/adt7462.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/lm78.c | 25 | ||||
| -rw-r--r-- | drivers/hwmon/w83781d.c | 26 |
3 files changed, 26 insertions, 27 deletions
diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c index a31e77c776ae..b8156b4893bb 100644 --- a/drivers/hwmon/adt7462.c +++ b/drivers/hwmon/adt7462.c | |||
| @@ -179,7 +179,7 @@ static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END }; | |||
| 179 | * | 179 | * |
| 180 | * Some, but not all, of these voltages have low/high limits. | 180 | * Some, but not all, of these voltages have low/high limits. |
| 181 | */ | 181 | */ |
| 182 | #define ADT7462_VOLT_COUNT 12 | 182 | #define ADT7462_VOLT_COUNT 13 |
| 183 | 183 | ||
| 184 | #define ADT7462_VENDOR 0x41 | 184 | #define ADT7462_VENDOR 0x41 |
| 185 | #define ADT7462_DEVICE 0x62 | 185 | #define ADT7462_DEVICE 0x62 |
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index cadcbd90ff3b..72ff2c4e757d 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
| @@ -851,17 +851,16 @@ static struct lm78_data *lm78_update_device(struct device *dev) | |||
| 851 | static int __init lm78_isa_found(unsigned short address) | 851 | static int __init lm78_isa_found(unsigned short address) |
| 852 | { | 852 | { |
| 853 | int val, save, found = 0; | 853 | int val, save, found = 0; |
| 854 | 854 | int port; | |
| 855 | /* We have to request the region in two parts because some | 855 | |
| 856 | boards declare base+4 to base+7 as a PNP device */ | 856 | /* Some boards declare base+0 to base+7 as a PNP device, some base+4 |
| 857 | if (!request_region(address, 4, "lm78")) { | 857 | * to base+7 and some base+5 to base+6. So we better request each port |
| 858 | pr_debug("lm78: Failed to request low part of region\n"); | 858 | * individually for the probing phase. */ |
| 859 | return 0; | 859 | for (port = address; port < address + LM78_EXTENT; port++) { |
| 860 | } | 860 | if (!request_region(port, 1, "lm78")) { |
| 861 | if (!request_region(address + 4, 4, "lm78")) { | 861 | pr_debug("lm78: Failed to request port 0x%x\n", port); |
| 862 | pr_debug("lm78: Failed to request high part of region\n"); | 862 | goto release; |
| 863 | release_region(address, 4); | 863 | } |
| 864 | return 0; | ||
| 865 | } | 864 | } |
| 866 | 865 | ||
| 867 | #define REALLY_SLOW_IO | 866 | #define REALLY_SLOW_IO |
| @@ -925,8 +924,8 @@ static int __init lm78_isa_found(unsigned short address) | |||
| 925 | val & 0x80 ? "LM79" : "LM78", (int)address); | 924 | val & 0x80 ? "LM79" : "LM78", (int)address); |
| 926 | 925 | ||
| 927 | release: | 926 | release: |
| 928 | release_region(address + 4, 4); | 927 | for (port--; port >= address; port--) |
| 929 | release_region(address, 4); | 928 | release_region(port, 1); |
| 930 | return found; | 929 | return found; |
| 931 | } | 930 | } |
| 932 | 931 | ||
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index 05f9225b6f94..32d4adee73db 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
| @@ -1793,17 +1793,17 @@ static int __init | |||
| 1793 | w83781d_isa_found(unsigned short address) | 1793 | w83781d_isa_found(unsigned short address) |
| 1794 | { | 1794 | { |
| 1795 | int val, save, found = 0; | 1795 | int val, save, found = 0; |
| 1796 | 1796 | int port; | |
| 1797 | /* We have to request the region in two parts because some | 1797 | |
| 1798 | boards declare base+4 to base+7 as a PNP device */ | 1798 | /* Some boards declare base+0 to base+7 as a PNP device, some base+4 |
| 1799 | if (!request_region(address, 4, "w83781d")) { | 1799 | * to base+7 and some base+5 to base+6. So we better request each port |
| 1800 | pr_debug("w83781d: Failed to request low part of region\n"); | 1800 | * individually for the probing phase. */ |
| 1801 | return 0; | 1801 | for (port = address; port < address + W83781D_EXTENT; port++) { |
| 1802 | } | 1802 | if (!request_region(port, 1, "w83781d")) { |
| 1803 | if (!request_region(address + 4, 4, "w83781d")) { | 1803 | pr_debug("w83781d: Failed to request port 0x%x\n", |
| 1804 | pr_debug("w83781d: Failed to request high part of region\n"); | 1804 | port); |
| 1805 | release_region(address, 4); | 1805 | goto release; |
| 1806 | return 0; | 1806 | } |
| 1807 | } | 1807 | } |
| 1808 | 1808 | ||
| 1809 | #define REALLY_SLOW_IO | 1809 | #define REALLY_SLOW_IO |
| @@ -1877,8 +1877,8 @@ w83781d_isa_found(unsigned short address) | |||
| 1877 | val == 0x30 ? "W83782D" : "W83781D", (int)address); | 1877 | val == 0x30 ? "W83782D" : "W83781D", (int)address); |
| 1878 | 1878 | ||
| 1879 | release: | 1879 | release: |
| 1880 | release_region(address + 4, 4); | 1880 | for (port--; port >= address; port--) |
| 1881 | release_region(address, 4); | 1881 | release_region(port, 1); |
| 1882 | return found; | 1882 | return found; |
| 1883 | } | 1883 | } |
| 1884 | 1884 | ||
