diff options
| author | Julia Lawall <julia@diku.dk> | 2010-02-06 05:43:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:10:57 -0300 |
| commit | 62bdbb735c0415c2ffdddc2269a860a76f7f716a (patch) | |
| tree | 6f46610dcccc749ab3c08a09e6c74d64811c5935 /drivers/media | |
| parent | f0289efa1938eac27a98883bf33af946b13e1110 (diff) | |
| download | linux-62bdbb735c0415c2ffdddc2269a860a76f7f716a.tar.gz linux-62bdbb735c0415c2ffdddc2269a860a76f7f716a.tar.bz2 linux-62bdbb735c0415c2ffdddc2269a860a76f7f716a.zip | |
V4L/DVB: drivers/media: Correct NULL test
In each case, the NULL test has been performed already.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@r@
expression *x;
expression e;
identifier l;
@@
if (x == NULL || ...) {
... when forall
return ...; }
... when != goto l;
when != x = e
when != &x
*x == NULL
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/frontends/stv0900_core.c | 5 | ||||
| -rw-r--r-- | drivers/media/video/cpia.c | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c index e5791b2b913b..01f8f1f802fd 100644 --- a/drivers/media/dvb/frontends/stv0900_core.c +++ b/drivers/media/dvb/frontends/stv0900_core.c @@ -1417,11 +1417,6 @@ static enum fe_stv0900_error stv0900_init_internal(struct dvb_frontend *fe, return error; } - if (state->internal == NULL) { - error = STV0900_INVALID_HANDLE; - return error; - } - intp = state->internal; intp->demod_mode = p_init->demod_mode; diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 551ddf216a4b..933ae4c8cb9a 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c @@ -3737,9 +3737,6 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma) if (size > FRAME_NUM*CPIA_MAX_FRAME_SIZE) return -EINVAL; - if (!cam || !cam->ops) - return -ENODEV; - /* make this _really_ smp-safe */ if (mutex_lock_interruptible(&cam->busy_lock)) return -EINTR; |