diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-22 23:11:18 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:55 -0500 |
commit | ae62e3d4a8194680023b47ab778bf1dcea8d6b42 (patch) | |
tree | ae95d5dcb341fd826911c307e27b52b23ef92acc /drivers/media/dvb/dvb-usb | |
parent | 4d6e772d989c11af7d7e41095f976cff5eeb43f3 (diff) |
V4L/DVB (3575): Cxusb: fix i2c debug messages for bluebird devices
Only the Medion boxes return 0x08 after an i2c read/write.
The bluebird devices do not return anything at all.
This patch conditionalizes the test for the 0x08 return code
to produce a warning message when using the Medion box, only.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index 9f9adb77e7e3..a14e737ec848 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -109,7 +109,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num) | |||
109 | break; | 109 | break; |
110 | 110 | ||
111 | if (ibuf[0] != 0x08) | 111 | if (ibuf[0] != 0x08) |
112 | deb_info("i2c read may have failed\n"); | 112 | deb_i2c("i2c read may have failed\n"); |
113 | 113 | ||
114 | memcpy(msg[i+1].buf,&ibuf[1],msg[i+1].len); | 114 | memcpy(msg[i+1].buf,&ibuf[1],msg[i+1].len); |
115 | 115 | ||
@@ -123,7 +123,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num) | |||
123 | if (cxusb_ctrl_msg(d,CMD_I2C_WRITE, obuf, 2+msg[i].len, &ibuf,1) < 0) | 123 | if (cxusb_ctrl_msg(d,CMD_I2C_WRITE, obuf, 2+msg[i].len, &ibuf,1) < 0) |
124 | break; | 124 | break; |
125 | if (ibuf != 0x08) | 125 | if (ibuf != 0x08) |
126 | deb_info("i2c write may have failed\n"); | 126 | deb_i2c("i2c write may have failed\n"); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||
diff --git a/drivers/media/dvb/dvb-usb/cxusb.h b/drivers/media/dvb/dvb-usb/cxusb.h index 087c99427853..c8ef77554b00 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.h +++ b/drivers/media/dvb/dvb-usb/cxusb.h | |||
@@ -6,6 +6,8 @@ | |||
6 | 6 | ||
7 | extern int dvb_usb_cxusb_debug; | 7 | extern int dvb_usb_cxusb_debug; |
8 | #define deb_info(args...) dprintk(dvb_usb_cxusb_debug,0x01,args) | 8 | #define deb_info(args...) dprintk(dvb_usb_cxusb_debug,0x01,args) |
9 | #define deb_i2c(args...) if (d->udev->descriptor.idVendor == USB_VID_MEDION) \ | ||
10 | dprintk(dvb_usb_cxusb_debug,0x01,args) | ||
9 | 11 | ||
10 | /* usb commands - some of it are guesses, don't have a reference yet */ | 12 | /* usb commands - some of it are guesses, don't have a reference yet */ |
11 | #define CMD_I2C_WRITE 0x08 | 13 | #define CMD_I2C_WRITE 0x08 |