Staging: merge staging patches into Linus's main branch

[karo-tx-linux.git] / drivers / staging / go7007 / s2250-board.c

diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c
index 8cf7f2750b3fbf4585554d48c7d5451ab955acb1..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)
@@ -667,7 +667,7 @@ static int s2250_remove(struct i2c_client *client)
        return 0;
 }
 
-static struct i2c_device_id s2250_id[] = {
+static const struct i2c_device_id s2250_id[] = {
        { "s2250", 0 },
        { }
 };