[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <9d890361120bf2a60800248f57636a982fb3e396.1475860773.git.mchehab@s-opensource.com>
Date: Fri, 7 Oct 2016 14:24:25 -0300
From: Mauro Carvalho Chehab <mchehab@...pensource.com>
To: Linux Media Mailing List <linux-media@...r.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@...pensource.com>,
Mauro Carvalho Chehab <mchehab@...radead.org>,
Andy Lutomirski <luto@...capital.net>,
Johannes Stezenbach <js@...uxtv.org>,
Jiri Kosina <jikos@...nel.org>,
Patrick Boettcher <patrick.boettcher@...teo.de>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Andy Lutomirski <luto@...nel.org>,
Michael Krufky <mkrufky@...uxtv.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Jörg Otte <jrg.otte@...il.com>,
Sean Young <sean@...s.org>,
Jonathan McDowell <noodles@...th.li>
Subject: [PATCH 15/26] dtt200u: handle USB control message errors
If something bad happens while an USB control message is
transfered, return an error code.
Signed-off-by: Mauro Carvalho Chehab <mchehab@...pensource.com>
---
drivers/media/usb/dvb-usb/dtt200u.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
index d6023fb6a1d4..ca8965b8b610 100644
--- a/drivers/media/usb/dvb-usb/dtt200u.c
+++ b/drivers/media/usb/dvb-usb/dtt200u.c
@@ -31,7 +31,7 @@ static int dtt200u_power_ctrl(struct dvb_usb_device *d, int onoff)
st->data[0] = SET_INIT;
if (onoff)
- dvb_usb_generic_write(d, st->data, 2);
+ return dvb_usb_generic_write(d, st->data, 2);
return 0;
}
@@ -39,19 +39,20 @@ static int dtt200u_power_ctrl(struct dvb_usb_device *d, int onoff)
static int dtt200u_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{
struct dtt200u_state *st = adap->dev->priv;
+ int ret;
st->data[0] = SET_STREAMING;
st->data[1] = onoff;
- dvb_usb_generic_write(adap->dev, st->data, 2);
+ ret = dvb_usb_generic_write(adap->dev, st->data, 2);
+ if (ret < 0)
+ return ret;
if (onoff)
return 0;
st->data[0] = RESET_PID_FILTER;
- dvb_usb_generic_write(adap->dev, st->data, 1);
-
- return 0;
+ return dvb_usb_generic_write(adap->dev, st->data, 1);
}
static int dtt200u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff)
@@ -72,10 +73,14 @@ static int dtt200u_rc_query(struct dvb_usb_device *d)
{
struct dtt200u_state *st = d->priv;
u32 scancode;
+ int ret;
st->data[0] = GET_RC_CODE;
- dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
+ ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
+ if (ret < 0)
+ return ret;
+
if (st->data[0] == 1) {
enum rc_type proto = RC_TYPE_NEC;
--
2.7.4
Powered by blists - more mailing lists