summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/cxusb.c
diff options
context:
space:
mode:
authorChris Pascoe2007-11-19 06:42:44 +0100
committerMauro Carvalho Chehab2008-01-25 22:02:17 +0100
commitb17f109df1cd9fe1009501d59e466701106590d7 (patch)
tree12db41381d724685f600e259c008318acdd70234 /drivers/media/dvb/dvb-usb/cxusb.c
parentV4L/DVB (6623): remove saa7134-oss (diff)
downloadkernel-qcow2-linux-b17f109df1cd9fe1009501d59e466701106590d7.tar.gz
kernel-qcow2-linux-b17f109df1cd9fe1009501d59e466701106590d7.tar.xz
kernel-qcow2-linux-b17f109df1cd9fe1009501d59e466701106590d7.zip
V4L/DVB (6624): CXUSB: return control message transfer result to caller
Callers to cxusb_ctrl_msg currently do not receive any indication that their transfer failed. Return the true return code from dvb_usb_generic_{rw,write}. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/cxusb.c')
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 5b6431ea38c1..b4a3f7baf1b7 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -49,11 +49,9 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
sndbuf[0] = cmd;
memcpy(&sndbuf[1], wbuf, wlen);
if (wo)
- dvb_usb_generic_write(d, sndbuf, 1+wlen);
+ return dvb_usb_generic_write(d, sndbuf, 1+wlen);
else
- dvb_usb_generic_rw(d, sndbuf, 1+wlen, rbuf, rlen, 0);
-
- return 0;
+ return dvb_usb_generic_rw(d, sndbuf, 1+wlen, rbuf, rlen, 0);
}
/* GPIO */