summaryrefslogtreecommitdiff
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-03-23 01:11:18 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 16:26:55 -0300
commitae62e3d4a8194680023b47ab778bf1dcea8d6b42 (patch)
treeae95d5dcb341fd826911c307e27b52b23ef92acc /drivers/media/dvb
parent4d6e772d989c11af7d7e41095f976cff5eeb43f3 (diff)
downloadlinux-rpi-ae62e3d4a8194680023b47ab778bf1dcea8d6b42.tar.gz
linux-rpi-ae62e3d4a8194680023b47ab778bf1dcea8d6b42.tar.bz2
linux-rpi-ae62e3d4a8194680023b47ab778bf1dcea8d6b42.zip
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')
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c4
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.h2
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)
break;
if (ibuf[0] != 0x08)
- deb_info("i2c read may have failed\n");
+ deb_i2c("i2c read may have failed\n");
memcpy(msg[i+1].buf,&ibuf[1],msg[i+1].len);
@@ -123,7 +123,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
if (cxusb_ctrl_msg(d,CMD_I2C_WRITE, obuf, 2+msg[i].len, &ibuf,1) < 0)
break;
if (ibuf != 0x08)
- deb_info("i2c write may have failed\n");
+ deb_i2c("i2c write may have failed\n");
}
}
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 @@
extern int dvb_usb_cxusb_debug;
#define deb_info(args...) dprintk(dvb_usb_cxusb_debug,0x01,args)
+#define deb_i2c(args...) if (d->udev->descriptor.idVendor == USB_VID_MEDION) \
+ dprintk(dvb_usb_cxusb_debug,0x01,args)
/* usb commands - some of it are guesses, don't have a reference yet */
#define CMD_I2C_WRITE 0x08