diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-21 07:45:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-21 07:45:30 -0300 |
| commit | 0b6f4aa0fc0cf793e97744580ad53e46f3f1bd95 (patch) | |
| tree | 2d2736f6914749502bdf0de211c78d1d56048d68 /linux/drivers/media/video/tuner-i2c.h | |
| parent | 865624af6da8960703f03756ab73c5438c1eff23 (diff) | |
| parent | a40b333c721d9353c3b7b98a22084e2c15095220 (diff) | |
| download | mediapointer-dvb-s2-0b6f4aa0fc0cf793e97744580ad53e46f3f1bd95.tar.gz mediapointer-dvb-s2-0b6f4aa0fc0cf793e97744580ad53e46f3f1bd95.tar.bz2 | |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tuner-i2c.h')
| -rw-r--r-- | linux/drivers/media/video/tuner-i2c.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tuner-i2c.h b/linux/drivers/media/video/tuner-i2c.h index 60ba79480..3ad6c8e0b 100644 --- a/linux/drivers/media/video/tuner-i2c.h +++ b/linux/drivers/media/video/tuner-i2c.h @@ -129,10 +129,10 @@ static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props, ({ \ int __ret = 0; \ list_for_each_entry(state, &list, hybrid_tuner_instance_list) { \ - if ((state->i2c_props.addr == i2caddr) && \ - ((state->i2c_props.adap ? \ - i2c_adapter_id(state->i2c_props.adap) : -1) == \ - (i2cadap ? i2c_adapter_id(i2cadap) : -1))) { \ + if (((i2cadap) && (state->i2c_props.adap)) && \ + ((i2c_adapter_id(state->i2c_props.adap) == \ + i2c_adapter_id(i2cadap)) && \ + (i2caddr == state->i2c_props.addr))) { \ __tuner_info(state->i2c_props, \ "attaching existing instance\n"); \ state->i2c_props.count++; \ |