From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: "Mauro Carvalho Chehab" <mchehab@s-opensource.com>,
"Mauro Carvalho Chehab" <mchehab@infradead.org>,
"Andy Lutomirski" <luto@amacapital.net>,
"Johannes Stezenbach" <js@linuxtv.org>,
"Jiri Kosina" <jikos@kernel.org>,
"Patrick Boettcher" <patrick.boettcher@posteo.de>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Andy Lutomirski" <luto@kernel.org>,
"Michael Krufky" <mkrufky@linuxtv.org>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Jörg Otte" <jrg.otte@gmail.com>
Subject: [PATCH 24/26] nova-t-usb2: handle error code on RC query
Date: Fri, 7 Oct 2016 14:24:34 -0300 [thread overview]
Message-ID: <fbb23e8037764f12f49473fa4e9e8c0feb94cbc3.1475860773.git.mchehab@s-opensource.com> (raw)
In-Reply-To: <cover.1475860773.git.mchehab@s-opensource.com>
In-Reply-To: <cover.1475860773.git.mchehab@s-opensource.com>
There's no sense on decoding and generating a RC key code if
there was an error on the URB control message.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
drivers/media/usb/dvb-usb/nova-t-usb2.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/nova-t-usb2.c b/drivers/media/usb/dvb-usb/nova-t-usb2.c
index 26d7188a1163..1babd3341910 100644
--- a/drivers/media/usb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/usb/dvb-usb/nova-t-usb2.c
@@ -76,7 +76,7 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
u8 *buf, data, toggle, custom;
u16 raw;
- int i;
+ int i, ret;
struct dibusb_device_state *st = d->priv;
buf = kmalloc(5, GFP_KERNEL);
@@ -85,7 +85,9 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
buf[0] = DIBUSB_REQ_POLL_REMOTE;
buf[1] = 0x35;
- dvb_usb_generic_rw(d, buf, 2, buf, 5, 0);
+ ret = dvb_usb_generic_rw(d, buf, 2, buf, 5, 0);
+ if (ret < 0)
+ goto ret;
*state = REMOTE_NO_KEY_PRESSED;
switch (buf[0]) {
@@ -124,8 +126,9 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
break;
}
+ret:
kfree(buf);
- return 0;
+ return ret;
}
static int nova_t_read_mac_address (struct dvb_usb_device *d, u8 mac[6])
--
2.7.4
next prev parent reply other threads:[~2016-10-07 17:27 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 17:24 [PATCH 00/26] Don't use stack for DMA transers on dvb-usb drivers Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 01/26] af9005: don't do DMA on stack Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 02/26] cinergyT2-core: " Mauro Carvalho Chehab
2016-10-10 6:39 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 03/26] cinergyT2-core:: handle error code on RC query Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 04/26] cinergyT2-fe: cache stats at cinergyt2_fe_read_status() Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 05/26] cinergyT2-fe: don't do DMA on stack Mauro Carvalho Chehab
2016-10-10 6:39 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 06/26] cxusb: " Mauro Carvalho Chehab
2016-10-10 6:38 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 07/26] dib0700: be sure that dib0700_ctrl_rd() users can do DMA Mauro Carvalho Chehab
2016-10-10 6:38 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 08/26] dib0700_core: don't use stack on I2C reads Mauro Carvalho Chehab
2016-10-10 6:37 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 09/26] dibusb: don't do DMA on stack Mauro Carvalho Chehab
2016-10-10 6:37 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 10/26] dibusb: handle error code on RC query Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 11/26] digitv: don't do DMA on stack Mauro Carvalho Chehab
2016-10-10 6:36 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 12/26] dtt200u-fe: " Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 13/26] dtt200u-fe: handle errors on USB control messages Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 14/26] dtt200u: don't do DMA on stack Mauro Carvalho Chehab
2016-10-10 6:36 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 15/26] dtt200u: handle USB control message errors Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 16/26] dtv5100: : don't do DMA on stack Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 17/26] gp8psk: " Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 18/26] gp8psk: don't go past the buffer size Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 19/26] nova-t-usb2: don't do DMA on stack Mauro Carvalho Chehab
2016-10-10 6:35 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 20/26] pctv452e: " Mauro Carvalho Chehab
2016-10-10 6:35 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 21/26] pctv452e: don't call BUG_ON() on non-fatal error Mauro Carvalho Chehab
2016-10-08 10:11 ` [PATCH v2 " Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 22/26] technisat-usb2: use DMA buffers for I2C transfers Mauro Carvalho Chehab
2016-10-10 6:34 ` Patrick Boettcher
2016-10-07 17:24 ` [PATCH 23/26] dvb-usb: warn if return value for USB read/write routines is not checked Mauro Carvalho Chehab
2016-10-07 17:24 ` Mauro Carvalho Chehab [this message]
2016-10-07 17:24 ` [PATCH 25/26] dw2102: return error if su3000_power_ctrl() fails Mauro Carvalho Chehab
2016-10-07 17:24 ` [PATCH 26/26] digitv: handle error code on RC query Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fbb23e8037764f12f49473fa4e9e8c0feb94cbc3.1475860773.git.mchehab@s-opensource.com \
--to=mchehab@s-opensource.com \
--cc=jikos@kernel.org \
--cc=jrg.otte@gmail.com \
--cc=js@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=luto@kernel.org \
--cc=mchehab@infradead.org \
--cc=mchehab@kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=patrick.boettcher@posteo.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®