Staging: merge staging patches into Linus's main branch

[net-next-2.6.git] / drivers / staging / go7007 / s2250-board.c

diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c
index 977df137a0cc9ec5df24ebd0e420086c5727a6ff..dc89502ea1b7ddce759040df0dc9d7a9b77658bb 100644 (file)
--- a/drivers/staging/go7007/s2250-board.c
+++ b/drivers/staging/go7007/s2250-board.c
@@ -159,7 +159,7 @@ static int write_reg(struct i2c_client *client, u8 reg, u8 value)
        struct go7007 *go = i2c_get_adapdata(client->adapter);
        struct go7007_usb *usb;
        int rc;
-       int dev_addr = client->addr;
+       int dev_addr = client->addr << 1;  /* firmware wants 8-bit address */
        u8 *buf;
 
        if (go == NULL)