Commit 59dad0cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  MAINTAINERS: Switch hdaps to Frank Seidel
  hwmon: Fix ACPI resource check error handling
  hwmon: (f71882fg) Hide misleading error message
parents 1024d1c2 211e3e0e

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -1905,10 +1905,10 @@ W: http://gigaset307x.sourceforge.net/ 
S:	Maintained



HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER

P:	Robert Love

M:	rlove@rlove.org

M:	linux-kernel@vger.kernel.org

W:	http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/

P:	Frank Seidel

M:	frank@f-seidel.de

L:	lm-sensors@lm-sensors.org

W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/

S:	Maintained



GSPCA FINEPIX SUBDRIVER

drivers/hwmon/f71882fg.c

+2 −2
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, 


	devid = superio_inw(sioaddr, SIO_REG_MANID);

	if (devid != SIO_FINTEK_ID) {

		printk(KERN_INFO DRVNAME ": Not a Fintek device\n");

		pr_debug(DRVNAME ": Not a Fintek device\n");

		goto exit;

	}
@@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(unsigned short address, 
	res.name = f71882fg_pdev->name;

	err = acpi_check_resource_conflict(&res);

	if (err)

		return err;

		goto exit_device_put;



	err = platform_device_add_resources(f71882fg_pdev, &res, 1);

	if (err) {

drivers/hwmon/vt1211.c

+1 −1
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsigned short address) 
	res.name = pdev->name;

	err = acpi_check_resource_conflict(&res);

	if (err)

		goto EXIT;

		goto EXIT_DEV_PUT;



	err = platform_device_add_resources(pdev, &res, 1);

	if (err) {

drivers/hwmon/w83627ehf.c

+1 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init(void) 


	err = acpi_check_resource_conflict(&res);

	if (err)

		goto exit;

		goto exit_device_put;



	err = platform_device_add_resources(pdev, &res, 1);

	if (err) {