Commit 157a5fe9 authored Jul 15, 2014 by Himangi Saraogi Committed by Mauro Carvalho Chehab Jul 22, 2014

[media] dib7000m: Remove unnecessary null test



This patch removes the null test on ch. ch is initialized at the
beginning of the function to &demod->dtv_property_cache. Since demod
is dereferenced prior to the null test, demod must be a valid pointer,
and &demod->dtv_property_cache cannot be null.

The following Coccinelle script is used for detecting the change:

@r@
expression e,f;
identifier g,y;
statement S1,S2;
@@

*e = &f->g
<+...
 f->y
 ...+>
*if (e != NULL || ...)
 S1 else S2

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

parent 277bfd2f

drivers/media/dvb-frontends/dib7000m.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1041,10 +1041,7 @@ static int dib7000m_tune(struct dvb_frontend *demod)
		u16 value;

		// we are already tuned - just resuming from suspend
		if (ch != NULL)
		dib7000m_set_channel(state, ch, 0);
		else
		return -EINVAL;

		// restart demod
		ret \|= dib7000m_write_word(state, 898, 0x4000);