Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62bdbb73 authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f0289efa

drivers/media/dvb/frontends/stv0900_core.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/cpia.c

+0 −3
Original line number Diff line number Diff line
@@ -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;