Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (w83781d) Request I/O ports individually for probing
hwmon: (lm78) Request I/O ports individually for probing
hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT
+24
-25
+1
-1
drivers/hwmon/adt7462.c
+1
-1
drivers/hwmon/adt7462.c
+11
-12
drivers/hwmon/lm78.c
+11
-12
drivers/hwmon/lm78.c
···
851
851
static int __init lm78_isa_found(unsigned short address)
852
852
{
853
853
int val, save, found = 0;
854
+
int port;
854
855
855
-
/* We have to request the region in two parts because some
856
-
boards declare base+4 to base+7 as a PNP device */
857
-
if (!request_region(address, 4, "lm78")) {
858
-
pr_debug("lm78: Failed to request low part of region\n");
859
-
return 0;
860
-
}
861
-
if (!request_region(address + 4, 4, "lm78")) {
862
-
pr_debug("lm78: Failed to request high part of region\n");
863
-
release_region(address, 4);
864
-
return 0;
856
+
/* Some boards declare base+0 to base+7 as a PNP device, some base+4
857
+
* to base+7 and some base+5 to base+6. So we better request each port
858
+
* individually for the probing phase. */
859
+
for (port = address; port < address + LM78_EXTENT; port++) {
860
+
if (!request_region(port, 1, "lm78")) {
861
+
pr_debug("lm78: Failed to request port 0x%x\n", port);
862
+
goto release;
863
+
}
865
864
}
866
865
867
866
#define REALLY_SLOW_IO
···
924
925
val & 0x80 ? "LM79" : "LM78", (int)address);
925
926
926
927
release:
927
-
release_region(address + 4, 4);
928
-
release_region(address, 4);
928
+
for (port--; port >= address; port--)
929
+
release_region(port, 1);
929
930
return found;
930
931
}
931
932
+12
-12
drivers/hwmon/w83781d.c
+12
-12
drivers/hwmon/w83781d.c
···
1793
1793
w83781d_isa_found(unsigned short address)
1794
1794
{
1795
1795
int val, save, found = 0;
1796
+
int port;
1796
1797
1797
-
/* We have to request the region in two parts because some
1798
-
boards declare base+4 to base+7 as a PNP device */
1799
-
if (!request_region(address, 4, "w83781d")) {
1800
-
pr_debug("w83781d: Failed to request low part of region\n");
1801
-
return 0;
1802
-
}
1803
-
if (!request_region(address + 4, 4, "w83781d")) {
1804
-
pr_debug("w83781d: Failed to request high part of region\n");
1805
-
release_region(address, 4);
1806
-
return 0;
1798
+
/* Some boards declare base+0 to base+7 as a PNP device, some base+4
1799
+
* to base+7 and some base+5 to base+6. So we better request each port
1800
+
* individually for the probing phase. */
1801
+
for (port = address; port < address + W83781D_EXTENT; port++) {
1802
+
if (!request_region(port, 1, "w83781d")) {
1803
+
pr_debug("w83781d: Failed to request port 0x%x\n",
1804
+
port);
1805
+
goto release;
1806
+
}
1807
1807
}
1808
1808
1809
1809
#define REALLY_SLOW_IO
···
1877
1877
val == 0x30 ? "W83782D" : "W83781D", (int)address);
1878
1878
1879
1879
release:
1880
-
release_region(address + 4, 4);
1881
-
release_region(address, 4);
1880
+
for (port--; port >= address; port--)
1881
+
release_region(port, 1);
1882
1882
return found;
1883
1883
}
1884
1884