From 1dac1495c146c686d2ac15810934e799d78225f2 Mon Sep 17 00:00:00 2001
From: Luca Tettamanti <kronos.it@gmail.com>
Date: Mon, 25 Jan 2010 15:00:49 +0100
Subject: [PATCH] --- yaml --- r: 179945 b: refs/heads/master c:
 5542482b9c61c2588f1178f315310a794988051a h: refs/heads/master i:   179943:
 71849699368ac5678294818b5541f0ff6a332042 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/hwmon/asus_atk0110.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8e789a78e97d..5ecfd55bd157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 316e2664dcc82e9c5f73360a4fb8f9279a8152ed
+refs/heads/master: 5542482b9c61c2588f1178f315310a794988051a
diff --git a/trunk/drivers/hwmon/asus_atk0110.c b/trunk/drivers/hwmon/asus_atk0110.c
index 6811346c1c62..028284f544e3 100644
--- a/trunk/drivers/hwmon/asus_atk0110.c
+++ b/trunk/drivers/hwmon/asus_atk0110.c
@@ -1329,17 +1329,16 @@ static int atk_add(struct acpi_device *device)
 			&buf, ACPI_TYPE_PACKAGE);
 	if (ret != AE_OK) {
 		dev_dbg(&device->dev, "atk: method MBIF not found\n");
-		err = -ENODEV;
-		goto out;
-	}
-
-	obj = buf.pointer;
-	if (obj->package.count >= 2 &&
-			obj->package.elements[1].type == ACPI_TYPE_STRING) {
-		dev_dbg(&device->dev, "board ID = %s\n",
-				obj->package.elements[1].string.pointer);
+	} else {
+		obj = buf.pointer;
+		if (obj->package.count >= 2) {
+			union acpi_object *id = &obj->package.elements[1];
+			if (id->type == ACPI_TYPE_STRING)
+				dev_dbg(&device->dev, "board ID = %s\n",
+					id->string.pointer);
+		}
+		ACPI_FREE(buf.pointer);
 	}
-	ACPI_FREE(buf.pointer);
 
 	err = atk_probe_if(data);
 	if (err) {