From 2af0a21b012eefca8f7ce8175fb7ae487f2ca3d6 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 16 Aug 2010 13:26:13 -0300 Subject: [PATCH] --- yaml --- r: 219067 b: refs/heads/master c: f27709792912d30a4f1f5ae98fd23aab2d4483b4 h: refs/heads/master i: 219065: 6cc3f6abeca2a417c9123bd35b7f5f592a8c1e24 219063: afea0c0c3f09452b0be8b28a58e7bc9add8590a8 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/drx397xD.c | 2 +- trunk/drivers/media/video/s2255drv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 13ac765bfd60..54feec69c995 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46a7a3cc9fe11f7a8d58fee6e7d5849298bc0212 +refs/heads/master: f27709792912d30a4f1f5ae98fd23aab2d4483b4 diff --git a/trunk/drivers/media/dvb/frontends/drx397xD.c b/trunk/drivers/media/dvb/frontends/drx397xD.c index f74cca6dc26b..a05007c80985 100644 --- a/trunk/drivers/media/dvb/frontends/drx397xD.c +++ b/trunk/drivers/media/dvb/frontends/drx397xD.c @@ -232,7 +232,7 @@ static int write_fw(struct drx397xD_state *s, enum blob_ix ix) exit_rc: read_unlock(&fw[s->chip_rev].lock); - return 0; + return rc; } /* Function is not endian safe, use the RD16 wrapper below */ diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c index 8ec7c9a45a17..8f7434182bc3 100644 --- a/trunk/drivers/media/video/s2255drv.c +++ b/trunk/drivers/media/video/s2255drv.c @@ -600,7 +600,7 @@ static int s2255_got_frame(struct s2255_channel *channel, int jpgsize) dprintk(2, "%s: [buf/i] [%p/%d]\n", __func__, buf, buf->vb.i); unlock: spin_unlock_irqrestore(&dev->slock, flags); - return 0; + return rc; } static const struct s2255_fmt *format_by_fourcc(int fourcc)