diff options
| author | Luca Tettamanti <kronos.it@gmail.com> | 2010-01-25 09:00:49 -0500 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2010-01-25 09:00:49 -0500 |
| commit | 5542482b9c61c2588f1178f315310a794988051a (patch) | |
| tree | 13f23a4bca5d825a8eecddeff1097e286bf20d7d | |
| parent | 316e2664dcc82e9c5f73360a4fb8f9279a8152ed (diff) | |
hwmon: (asus_atk0110) Do not fail if MBIF is missing
MBIF (motherboard identification) is only used to print the name of
the board, it's not essential for the driver; do not fail if it's
missing. Based on Juan's patch.
Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>
Acked-by: Juan RP <xtraeme@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/hwmon/asus_atk0110.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 6811346c1c62..028284f544e3 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c | |||
| @@ -1329,17 +1329,16 @@ static int atk_add(struct acpi_device *device) | |||
| 1329 | &buf, ACPI_TYPE_PACKAGE); | 1329 | &buf, ACPI_TYPE_PACKAGE); |
| 1330 | if (ret != AE_OK) { | 1330 | if (ret != AE_OK) { |
| 1331 | dev_dbg(&device->dev, "atk: method MBIF not found\n"); | 1331 | dev_dbg(&device->dev, "atk: method MBIF not found\n"); |
| 1332 | err = -ENODEV; | 1332 | } else { |
| 1333 | goto out; | 1333 | obj = buf.pointer; |
| 1334 | } | 1334 | if (obj->package.count >= 2) { |
| 1335 | 1335 | union acpi_object *id = &obj->package.elements[1]; | |
| 1336 | obj = buf.pointer; | 1336 | if (id->type == ACPI_TYPE_STRING) |
| 1337 | if (obj->package.count >= 2 && | 1337 | dev_dbg(&device->dev, "board ID = %s\n", |
| 1338 | obj->package.elements[1].type == ACPI_TYPE_STRING) { | 1338 | id->string.pointer); |
| 1339 | dev_dbg(&device->dev, "board ID = %s\n", | 1339 | } |
| 1340 | obj->package.elements[1].string.pointer); | 1340 | ACPI_FREE(buf.pointer); |
| 1341 | } | 1341 | } |
| 1342 | ACPI_FREE(buf.pointer); | ||
| 1343 | 1342 | ||
| 1344 | err = atk_probe_if(data); | 1343 | err = atk_probe_if(data); |
| 1345 | if (err) { | 1344 | if (err) { |
