diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:14:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:14:15 -0800 |
| commit | 59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc (patch) | |
| tree | 8ad125b55c285522e629025b6958f61960e5625e | |
| parent | 1024d1c24bb3f2c4dc568d96d3b5e22ea5865481 (diff) | |
| parent | 211e3e0e1b116b10ba707db2fec972909fa647fd (diff) | |
| download | op-kernel-dev-59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc.zip op-kernel-dev-59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc.tar.gz | |
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
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | drivers/hwmon/f71882fg.c | 4 | ||||
| -rw-r--r-- | drivers/hwmon/vt1211.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 53b50c8..e784b35 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c index 609caff..5f81ddf 100644 --- a/drivers/hwmon/f71882fg.c +++ b/drivers/hwmon/f71882fg.c @@ -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) { diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index b0ce378..73f77a9 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c @@ -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) { diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index cb808d0..feae743 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -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) { |
