diff options
| -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, | |||
| 129 | ({ \ | 129 | ({ \ |
| 130 | int __ret = 0; \ | 130 | int __ret = 0; \ |
| 131 | list_for_each_entry(state, &list, hybrid_tuner_instance_list) { \ | 131 | list_for_each_entry(state, &list, hybrid_tuner_instance_list) { \ |
| 132 | if ((state->i2c_props.addr == i2caddr) && \ | 132 | if (((i2cadap) && (state->i2c_props.adap)) && \ |
| 133 | ((state->i2c_props.adap ? \ | 133 | ((i2c_adapter_id(state->i2c_props.adap) == \ |
| 134 | i2c_adapter_id(state->i2c_props.adap) : -1) == \ | 134 | i2c_adapter_id(i2cadap)) && \ |
| 135 | (i2cadap ? i2c_adapter_id(i2cadap) : -1))) { \ | 135 | (i2caddr == state->i2c_props.addr))) { \ |
| 136 | __tuner_info(state->i2c_props, \ | 136 | __tuner_info(state->i2c_props, \ |
| 137 | "attaching existing instance\n"); \ | 137 | "attaching existing instance\n"); \ |
| 138 | state->i2c_props.count++; \ | 138 | state->i2c_props.count++; \ |