From: Alistair John Strachan <alistair@devzero.co.uk>
Date: Thu, 15 Jan 2009 21:27:48 +0000 (+0100)
Subject: hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe
X-Git-Tag: v2.6.27.13~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=974240e865a9ec89e62119e196518d1c185a6513;p=thirdparty%2Fkernel%2Fstable.git

hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe

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>
---

diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index d9e7a49d6cbf0..58a5efbe62b5b 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -1153,7 +1153,7 @@ static int __init abituguru3_dmi_detect(void)
 
 static inline int abituguru3_dmi_detect(void)
 {
-	return -ENODEV;
+	return 1;
 }
 
 #endif /* CONFIG_DMI */