diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 17:41:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 17:41:25 -0400 |
commit | 5d9adefc1e7218d060a88416943dd18e86c3c975 (patch) | |
tree | 0a25af1fccf390e4be11d8a3c00b4179893f7430 | |
parent | 1e3cbe4c274b2794fd2888f2c71ea97c9b5f9519 (diff) | |
parent | 15bde2f1a8e819213f54314505a5a0509673109b (diff) |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: End of I/O region off-by-one
-rw-r--r-- | drivers/hwmon/lm78.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/w83781d.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 565c4e679b8d..6eea3476b90c 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -882,7 +882,7 @@ static int __init lm78_isa_device_add(unsigned short address) | |||
882 | { | 882 | { |
883 | struct resource res = { | 883 | struct resource res = { |
884 | .start = address, | 884 | .start = address, |
885 | .end = address + LM78_EXTENT, | 885 | .end = address + LM78_EXTENT - 1, |
886 | .name = "lm78", | 886 | .name = "lm78", |
887 | .flags = IORESOURCE_IO, | 887 | .flags = IORESOURCE_IO, |
888 | }; | 888 | }; |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index c95909cc1d21..dcc941a5aaff 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
@@ -1746,7 +1746,7 @@ w83781d_isa_device_add(unsigned short address) | |||
1746 | { | 1746 | { |
1747 | struct resource res = { | 1747 | struct resource res = { |
1748 | .start = address, | 1748 | .start = address, |
1749 | .end = address + W83781D_EXTENT, | 1749 | .end = address + W83781D_EXTENT - 1, |
1750 | .name = "w83781d", | 1750 | .name = "w83781d", |
1751 | .flags = IORESOURCE_IO, | 1751 | .flags = IORESOURCE_IO, |
1752 | }; | 1752 | }; |