diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:41:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:41:25 -0700 |
commit | 5d9adefc1e7218d060a88416943dd18e86c3c975 (patch) | |
tree | 0a25af1fccf390e4be11d8a3c00b4179893f7430 | |
parent | 1e3cbe4c274b2794fd2888f2c71ea97c9b5f9519 (diff) | |
parent | 15bde2f1a8e819213f54314505a5a0509673109b (diff) | |
download | linux-5d9adefc1e7218d060a88416943dd18e86c3c975.tar.gz linux-5d9adefc1e7218d060a88416943dd18e86c3c975.tar.bz2 linux-5d9adefc1e7218d060a88416943dd18e86c3c975.zip |
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) { struct resource res = { .start = address, - .end = address + LM78_EXTENT, + .end = address + LM78_EXTENT - 1, .name = "lm78", .flags = IORESOURCE_IO, }; 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) { struct resource res = { .start = address, - .end = address + W83781D_EXTENT, + .end = address + W83781D_EXTENT - 1, .name = "w83781d", .flags = IORESOURCE_IO, }; |