From patchwork Sat Oct 2 13:59:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 4483 Return-path: Envelope-to: mchehab@pedra Delivery-date: Sat, 02 Oct 2010 11:47:25 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1P23My-0001FJ-PM for mchehab@pedra; Sat, 02 Oct 2010 11:47:25 -0300 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Sat, 02 Oct 2010 11:47:24 -0300 (BRT) Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1P22Zt-0002dm-OK for mchehab@bombadil.infradead.org; Sat, 02 Oct 2010 13:56:41 +0000 Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P22Zs-0003Rq-AX; Sat, 02 Oct 2010 13:56:40 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755482Ab0JBNy5 (ORCPT + 1 other); Sat, 2 Oct 2010 09:54:57 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:52926 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753800Ab0JBNy4 (ORCPT ); Sat, 2 Oct 2010 09:54:56 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id EC73C19BC58; Sat, 2 Oct 2010 15:54:55 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 20008-19; Sat, 2 Oct 2010 15:54:54 +0200 (CEST) Received: from palace.topps.diku.dk (palace.ekstranet.diku.dk [192.38.115.202]) by mgw2.diku.dk (Postfix) with ESMTP id 8A29619BC45; Sat, 2 Oct 2010 15:54:54 +0200 (CEST) From: Julia Lawall To: Mauro Carvalho Chehab Cc: kernel-janitors@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] drivers/media/dvb/ttpci/av7110_av.c: Add missing error handling code Date: Sat, 2 Oct 2010 15:59:15 +0200 Message-Id: <1286027958-7333-1-git-send-email-julia@diku.dk> X-Mailer: git-send-email 1.7.1 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Extend the error handling code with operations found in other nearby error handling code. A simplified version of the sematic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ @r@ statement S1,S2,S3; constant C1,C2,C3; @@ *if (...) {... S1 return -C1;} ... *if (...) {... when != S1 return -C2;} ... *if (...) {... S1 return -C3;} // Signed-off-by: Julia Lawall --- This is only a suggestion. All of the other ways out of this function call wake_up(&buf->queue);. But I don't understand the code well enough to know why, or whether there is a reason not to do it in this case. drivers/media/dvb/ttpci/av7110_av.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index 6ef3996..3ce5ccf 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c @@ -245,8 +245,11 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) return -1; } while (1) { - if ((len = dvb_ringbuffer_avail(buf)) < 6) + len = dvb_ringbuffer_avail(buf); + if (len < 6) { + wake_up(&buf->queue); return -1; + } sync = DVB_RINGBUFFER_PEEK(buf, 0) << 24; sync |= DVB_RINGBUFFER_PEEK(buf, 1) << 16; sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8;