Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9adefc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1e3cbe4c 15bde2f1

drivers/hwmon/lm78.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};

drivers/hwmon/w83781d.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};