From ff458cba0998c7ca2874cd8893e4a9ec36f6de44 Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Tue, 18 Sep 2012 08:22:33 -0300 Subject: [PATCH] --- yaml --- r: 331156 b: refs/heads/master c: 66ba9590c97abd69ea1340b90946363a6b1d33c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-tea5764.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 457cd2bb2269..a145f23ffb44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 752d283a70a246140c67daf355f04136e2bf340f +refs/heads/master: 66ba9590c97abd69ea1340b90946363a6b1d33c3 diff --git a/trunk/drivers/media/radio/radio-tea5764.c b/trunk/drivers/media/radio/radio-tea5764.c index efb05aa81d08..d0c905310071 100644 --- a/trunk/drivers/media/radio/radio-tea5764.c +++ b/trunk/drivers/media/radio/radio-tea5764.c @@ -151,8 +151,11 @@ int tea5764_i2c_read(struct tea5764_device *radio) u16 *p = (u16 *) &radio->regs; struct i2c_msg msgs[1] = { - { radio->i2c_client->addr, I2C_M_RD, sizeof(radio->regs), - (void *)&radio->regs }, + { .addr = radio->i2c_client->addr, + .flags = I2C_M_RD, + .len = sizeof(radio->regs), + .buf = (void *)&radio->regs + }, }; if (i2c_transfer(radio->i2c_client->adapter, msgs, 1) != 1) return -EIO; @@ -167,7 +170,11 @@ int tea5764_i2c_write(struct tea5764_device *radio) struct tea5764_write_regs wr; struct tea5764_regs *r = &radio->regs; struct i2c_msg msgs[1] = { - { radio->i2c_client->addr, 0, sizeof(wr), (void *) &wr }, + { + .addr = radio->i2c_client->addr, + .len = sizeof(wr), + .buf = (void *)&wr + }, }; wr.intreg = r->intreg & 0xff; wr.frqset = __cpu_to_be16(r->frqset);