diff --git a/[refs] b/[refs]
index 5ec0cfbeb444..d9656a9b5fb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7daa4a8897e79911f524ddac065adea05c7e9b16
+refs/heads/master: cac2b0eb18e140e2f63146d0f97691e9238570b6
diff --git a/trunk/drivers/media/video/tuner-i2c.h b/trunk/drivers/media/video/tuner-i2c.h
index 60ba794809fe..3ad6c8e0b04c 100644
--- a/trunk/drivers/media/video/tuner-i2c.h
+++ b/trunk/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++;			\