Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231000
b: refs/heads/master
c: 4d1cdbf
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Warren authored and Samuel Ortiz committed Jan 14, 2011
1 parent d612bb1 commit 72332b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 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: 5b9cecd68f3ef72ab9e586b0c2995a40a2f1e630
refs/heads/master: 4d1cdbf696501c0a942c5b71f3fab9434a4465c4
8 changes: 1 addition & 7 deletions trunk/drivers/mfd/tps6586x.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@

/* device id */
#define TPS6586X_VERSIONCRC 0xcd
#define TPS658621A_VERSIONCRC 0x15
#define TPS658621C_VERSIONCRC 0x2c

struct tps6586x_irq_data {
u8 mask_reg;
Expand Down Expand Up @@ -498,11 +496,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
return -EIO;
}

if ((ret != TPS658621A_VERSIONCRC) &&
(ret != TPS658621C_VERSIONCRC)) {
dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
return -ENODEV;
}
dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);

tps6586x = kzalloc(sizeof(struct tps6586x), GFP_KERNEL);
if (tps6586x == NULL)
Expand Down

0 comments on commit 72332b8

Please sign in to comment.