diff options
| author | Michael Krufky | 2008-04-22 19:46:04 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-04-24 19:07:51 +0200 |
| commit | cac2b0eb18e140e2f63146d0f97691e9238570b6 (patch) | |
| tree | a787ce86b8b276bc936e0a16c74893fdb53c083c | |
| parent | V4L/DVB (7378): cleanup variable initialization (diff) | |
| download | kernel-qcow2-linux-cac2b0eb18e140e2f63146d0f97691e9238570b6.tar.gz kernel-qcow2-linux-cac2b0eb18e140e2f63146d0f97691e9238570b6.tar.xz kernel-qcow2-linux-cac2b0eb18e140e2f63146d0f97691e9238570b6.zip | |
V4L/DVB (7379): tuner: prevent instance sharing if i2c adapter is NULL
We currently do not have a method to enable instance staring if i2c adapter
is NULL, in the cases of dvb demods that write to the tuner directly using
calc_regs. Prevent possible wrong instance sharing for these cases until
a better solution can be found.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/tuner-i2c.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tuner-i2c.h b/drivers/media/video/tuner-i2c.h index 60ba794809fe..3ad6c8e0b04c 100644 --- a/drivers/media/video/tuner-i2c.h +++ b/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++; \ |