Skip to content

Commit

Permalink
[media] dib7000m: Remove unnecessary null test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Himangi Saraogi authored and Mauro Carvalho Chehab committed Jul 23, 2014
1 parent 277bfd2 commit 157a5fe
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/media/dvb-frontends/dib7000m.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
dib7000m_set_channel(state, ch, 0);

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

0 comments on commit 157a5fe

Please sign in to comment.