From 2dfe58fb238e82ed6c337bf9fc337edb6d696283 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 22 Apr 2008 14:42:05 -0300 Subject: [PATCH] --- yaml --- r: 92376 b: refs/heads/master c: ab6c46e24a3c89c1e2d0d3959e119583e1bc92d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-i2c.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0f73b44a4311..5b9cd913a4e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdb0aace95d42571ea054a56ed053f868336e13a +refs/heads/master: ab6c46e24a3c89c1e2d0d3959e119583e1bc92d9 diff --git a/trunk/drivers/media/video/tuner-i2c.h b/trunk/drivers/media/video/tuner-i2c.h index c53c327a487c..60ba794809fe 100644 --- a/trunk/drivers/media/video/tuner-i2c.h +++ b/trunk/drivers/media/video/tuner-i2c.h @@ -83,7 +83,8 @@ static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props, #define tuner_printk(kernlvl, i2cprops, fmt, arg...) do { \ printk(kernlvl "%s %d-%04x: " fmt, i2cprops.name, \ - i2c_adapter_id(i2cprops.adap), \ + i2cprops.adap ? \ + i2c_adapter_id(i2cprops.adap) : -1, \ i2cprops.addr, ##arg); \ } while (0) @@ -128,9 +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 ((i2c_adapter_id(state->i2c_props.adap) == \ - i2c_adapter_id(i2cadap)) && \ - (state->i2c_props.addr == i2caddr)) { \ + if ((state->i2c_props.addr == i2caddr) && \ + ((state->i2c_props.adap ? \ + i2c_adapter_id(state->i2c_props.adap) : -1) == \ + (i2cadap ? i2c_adapter_id(i2cadap) : -1))) { \ __tuner_info(state->i2c_props, \ "attaching existing instance\n"); \ state->i2c_props.count++; \