aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-04-22 14:42:05 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:07:43 -0300
commitab6c46e24a3c89c1e2d0d3959e119583e1bc92d9 (patch)
treec64ba84af1ec78289a9022874566605765a2010a /drivers
parentbdb0aace95d42571ea054a56ed053f868336e13a (diff)
V4L/DVB (7184): make hybrid_tuner_request_state tolerant of devices without i2c adapters
Some dvb demodulators access the tuner directly without using i2c. In these cases, i2c_adap may be NULL. This patch fixes hybrid_tuner_request_state to allow for NULL i2c_adapters. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/tuner-i2c.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/tuner-i2c.h b/drivers/media/video/tuner-i2c.h
index c53c327a487..60ba794809f 100644
--- a/drivers/media/video/tuner-i2c.h
+++ b/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++; \