Skip to content

Commit

Permalink
max732x: correct nr_port checking off by one error
Browse files Browse the repository at this point in the history
Setup both client_group_a and client_group_b if nr_port > 8 (not including
nr_port==8).

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Eric Miao <eric.miao@marvell.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Axel Lin authored and Linus Torvalds committed May 27, 2010
1 parent c1cc9b9 commit 5535cb6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpio/max732x.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,14 +595,14 @@ static int __devinit max732x_probe(struct i2c_client *client,
switch (client->addr & 0x70) {
case 0x60:
chip->client_group_a = client;
if (nr_port > 7) {
if (nr_port > 8) {
c = i2c_new_dummy(client->adapter, addr_b);
chip->client_group_b = chip->client_dummy = c;
}
break;
case 0x50:
chip->client_group_b = client;
if (nr_port > 7) {
if (nr_port > 8) {
c = i2c_new_dummy(client->adapter, addr_a);
chip->client_group_a = chip->client_dummy = c;
}
Expand All @@ -617,7 +617,7 @@ static int __devinit max732x_probe(struct i2c_client *client,
mutex_init(&chip->lock);

max732x_readb(chip, is_group_a(chip, 0), &chip->reg_out[0]);
if (nr_port > 7)
if (nr_port > 8)
max732x_readb(chip, is_group_a(chip, 8), &chip->reg_out[1]);

ret = max732x_irq_setup(chip, id);
Expand Down

0 comments on commit 5535cb6

Please sign in to comment.