aboutsummaryrefslogtreecommitdiff
path: root/drivers/hwmon/pmbus/ucd9000.c
diff options
context:
space:
mode:
authorBarry Song <Barry.Song@csr.com>2011-10-24 02:40:40 -0700
committerBarry Song <Barry.Song@csr.com>2011-10-24 02:45:43 -0700
commit1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch)
treecddb92f82bda3a5f362bb6d9f775d25dd1205e6b /drivers/hwmon/pmbus/ucd9000.c
parent2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff)
parent91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff)
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'drivers/hwmon/pmbus/ucd9000.c')
-rw-r--r--drivers/hwmon/pmbus/ucd9000.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index ace1c731973..d0ddb60155c 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -141,13 +141,11 @@ static int ucd9000_probe(struct i2c_client *client,
block_buffer[ret] = '\0';
dev_info(&client->dev, "Device ID %s\n", block_buffer);
- mid = NULL;
- for (i = 0; i < ARRAY_SIZE(ucd9000_id); i++) {
- mid = &ucd9000_id[i];
+ for (mid = ucd9000_id; mid->name[0]; mid++) {
if (!strncasecmp(mid->name, block_buffer, strlen(mid->name)))
break;
}
- if (!mid || !strlen(mid->name)) {
+ if (!mid->name[0]) {
dev_err(&client->dev, "Unsupported device\n");
return -ENODEV;
}