* [PATCH] hwmon: (pmbus) Fix the logic of checking if no id is matched
@ 2011-08-31 3:44 Axel Lin
0 siblings, 0 replies; only message in thread
From: Axel Lin @ 2011-08-31 3:44 UTC (permalink / raw)
To: linux-kernel; +Cc: Guenter Roeck, Jean Delvare, lm-sensors
If no id is matched, the mid pointer is not NULL in current implementation.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/hwmon/pmbus/ucd9000.c | 3 +--
drivers/hwmon/pmbus/ucd9200.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 285bb15..4aa8701 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -141,13 +141,12 @@ 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];
if (!strncasecmp(mid->name, block_buffer, strlen(mid->name)))
break;
}
- if (!mid || !strlen(mid->name)) {
+ if ((i == ARRAY_SIZE(ucd9000_id)) || !strlen(mid->name)) {
dev_err(&client->dev, "Unsupported device\n");
return -ENODEV;
}
diff --git a/drivers/hwmon/pmbus/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c
index 786f6cd..826cc8f 100644
--- a/drivers/hwmon/pmbus/ucd9200.c
+++ b/drivers/hwmon/pmbus/ucd9200.c
@@ -68,13 +68,12 @@ static int ucd9200_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(ucd9200_id); i++) {
mid = &ucd9200_id[i];
if (!strncasecmp(mid->name, block_buffer, strlen(mid->name)))
break;
}
- if (!mid || !strlen(mid->name)) {
+ if ((i == ARRAY_SIZE(ucd9200_id)) || !strlen(mid->name)) {
dev_err(&client->dev, "Unsupported device\n");
return -ENODEV;
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-31 3:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-31 3:44 [PATCH] hwmon: (pmbus) Fix the logic of checking if no id is matched Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox