Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180321
b: refs/heads/master
c: b0bcdd3
h: refs/heads/master
i:
  180319: d280d08
v: v3
  • Loading branch information
Jean Delvare committed Feb 5, 2010
1 parent 62cd25c commit d74b245
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 197027e6ef830d60e10f76efc8d12bf3b6c35db5
refs/heads/master: b0bcdd3cd0adb85a7686b396ba50493871b1135c
26 changes: 13 additions & 13 deletions trunk/drivers/hwmon/w83781d.c
Original file line number Diff line number Diff line change
Expand Up @@ -1793,17 +1793,17 @@ static int __init
w83781d_isa_found(unsigned short address)
{
int val, save, found = 0;

/* We have to request the region in two parts because some
boards declare base+4 to base+7 as a PNP device */
if (!request_region(address, 4, "w83781d")) {
pr_debug("w83781d: Failed to request low part of region\n");
return 0;
}
if (!request_region(address + 4, 4, "w83781d")) {
pr_debug("w83781d: Failed to request high part of region\n");
release_region(address, 4);
return 0;
int port;

/* Some boards declare base+0 to base+7 as a PNP device, some base+4
* to base+7 and some base+5 to base+6. So we better request each port
* individually for the probing phase. */
for (port = address; port < address + W83781D_EXTENT; port++) {
if (!request_region(port, 1, "w83781d")) {
pr_debug("w83781d: Failed to request port 0x%x\n",
port);
goto release;
}
}

#define REALLY_SLOW_IO
Expand Down Expand Up @@ -1877,8 +1877,8 @@ w83781d_isa_found(unsigned short address)
val == 0x30 ? "W83782D" : "W83781D", (int)address);

release:
release_region(address + 4, 4);
release_region(address, 4);
for (port--; port >= address; port--)
release_region(port, 1);
return found;
}

Expand Down

0 comments on commit d74b245

Please sign in to comment.