Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227739
b: refs/heads/master
c: 4d630e2
h: refs/heads/master
i:
  227737: f085e7b
  227735: 8eeac2a
v: v3
  • Loading branch information
Joe Perches authored and Guenter Roeck committed Jan 8, 2011
1 parent 0a4cbfe commit 6515225
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e991201e4ebffb1fb32873d72e2ee4b499269c3
refs/heads/master: 4d630e2ba59a231c8e5031cc55e16737aa59af97
9 changes: 5 additions & 4 deletions trunk/drivers/hwmon/asb100.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
asb100 7 3 1 4 0x31 0x0694 yes no
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/slab.h>
#include <linux/i2c.h>
Expand Down Expand Up @@ -701,8 +703,7 @@ static int asb100_detect(struct i2c_client *client,
int val1, val2;

if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
pr_debug("asb100.o: detect failed, "
"smbus byte data not supported!\n");
pr_debug("detect failed, smbus byte data not supported!\n");
return -ENODEV;
}

Expand All @@ -715,7 +716,7 @@ static int asb100_detect(struct i2c_client *client,
(((!(val1 & 0x80)) && (val2 != 0x94)) ||
/* Check for ASB100 ID (high byte ) */
((val1 & 0x80) && (val2 != 0x06)))) {
pr_debug("asb100: detect failed, bad chip id 0x%02x!\n", val2);
pr_debug("detect failed, bad chip id 0x%02x!\n", val2);
return -ENODEV;
}

Expand Down Expand Up @@ -744,7 +745,7 @@ static int asb100_probe(struct i2c_client *client,

data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL);
if (!data) {
pr_debug("asb100.o: probe failed, kzalloc failed!\n");
pr_debug("probe failed, kzalloc failed!\n");
err = -ENOMEM;
goto ERROR0;
}
Expand Down

0 comments on commit 6515225

Please sign in to comment.