diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-10-17 12:59:20 +0400 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-10-17 12:59:20 +0400 |
| commit | 0b4f5b1d6385826093dc3cd9035b186f0d77a5dc (patch) | |
| tree | e7602057216d3de837995b267a281ae09d899a26 /drivers/media/radio/saa7706h.c | |
| parent | 939ccba437da1726a5c8a5b702a47d473da927ae (diff) | |
| parent | 9f0d3c2781baa1102108e16efbe640dd74564a7c (diff) | |
| download | linux-0b4f5b1d6385826093dc3cd9035b186f0d77a5dc.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target.
Diffstat (limited to 'drivers/media/radio/saa7706h.c')
| -rw-r--r-- | drivers/media/radio/saa7706h.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c index bb953ef75f61..54db36ccb9ee 100644 --- a/drivers/media/radio/saa7706h.c +++ b/drivers/media/radio/saa7706h.c @@ -199,8 +199,19 @@ static int saa7706h_get_reg16(struct v4l2_subdev *sd, u16 reg) u8 buf[2]; int err; u8 regaddr[] = {reg >> 8, reg}; - struct i2c_msg msg[] = { {client->addr, 0, sizeof(regaddr), regaddr}, - {client->addr, I2C_M_RD, sizeof(buf), buf} }; + struct i2c_msg msg[] = { + { + .addr = client->addr, + .len = sizeof(regaddr), + .buf = regaddr + }, + { + .addr = client->addr, + .flags = I2C_M_RD, + .len = sizeof(buf), + .buf = buf + } + }; err = saa7706h_i2c_transfer(client, msg, ARRAY_SIZE(msg)); if (err) |