[patch 26/40] hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe

Greg KH
2009-01-23T06:25:54Z

[-- Attachment #1: hwmon-fix-config_dmi-n-fallback-to-probe.patch --]
[-- Type: text/plain, Size: 1010 bytes --]

2.6.27-stable review patch. If anyone has any objections, please let us know.

------------------

From: Alistair John Strachan <alistair@devzero.co.uk>

commit 46a5f173fc88ffc22651162033696d8a9fbcdc5c upstream.

When CONFIG_DMI is not enabled, dmi detection should flag that no board
could be detected (err=1) rather than another error condition (err<0).

This fixes the fallback to manual probing for all motherboards, even
those without DMI strings, when CONFIG_DMI=n.

Signed-off-by: Alistair John Strachan <alistair@devzero.co.uk>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
drivers/hwmon/abituguru3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -1153,7 +1153,7 @@ static int __init abituguru3_dmi_detect(

static inline int abituguru3_dmi_detect(void)
{
- return -ENODEV;
+ return 1;
}

#endif /* CONFIG_DMI */