From: Axel Lin Date: Wed, 26 May 2010 21:42:20 +0000 (-0700) Subject: max732x: correct nr_port checking off by one error X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5535cb681c38bda94af02ef4b043a25b52303e65;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git max732x: correct nr_port checking off by one error Setup both client_group_a and client_group_b if nr_port > 8 (not including nr_port==8). Signed-off-by: Axel Lin Cc: Eric Miao Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/gpio/max732x.c b/drivers/gpio/max732x.c index 2053ba9cbfae..26ff40110d9f 100644 --- a/drivers/gpio/max732x.c +++ b/drivers/gpio/max732x.c @@ -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; } @@ -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);