diff options
| author | Julia Lawall <julia@diku.dk> | 2010-10-02 10:59:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 07:54:29 -0200 |
| commit | 92d0d66c1515c8ee3b700ab3d610587c71fe497f (patch) | |
| tree | cdc97edaa400a642d21806415b335d90a8cd41d7 /drivers/media/dvb | |
| parent | bdd1751b49be2860cc8c6a61e8fadda0caf22e5a (diff) | |
| download | linux-3.10-92d0d66c1515c8ee3b700ab3d610587c71fe497f.tar.gz linux-3.10-92d0d66c1515c8ee3b700ab3d610587c71fe497f.tar.bz2 linux-3.10-92d0d66c1515c8ee3b700ab3d610587c71fe497f.zip | |
[media] drivers/media/dvb/ttpci/av7110_av.c: Add missing error handling code
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/)
// <smpl>
@r exists@
@r@
statement S1,S2,S3;
constant C1,C2,C3;
@@
*if (...)
{... S1 return -C1;}
...
*if (...)
{... when != S1
return -C2;}
...
*if (...)
{... S1 return -C3;}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index 13efba942da..4a31cf67463 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; |