diff options
| author |   Himangi Saraogi <himangi774@gmail.com> | 2014-07-15 18:31:17 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-22 21:42:23 -0300 |
| commit | 157a5fe90ab92989c59b0494a51258e2dacf92f9 (patch) | |
| tree | dcb5dd9c73d7250164dfc6f1ba77dcef89cec88f /drivers/media/dvb-frontends/dib7000m.c | |
| parent | [media] mb86a20s: Fix the code that estimates the measurement interval (diff) | |
| download | linux-dev-157a5fe90ab92989c59b0494a51258e2dacf92f9.tar.xz linux-dev-157a5fe90ab92989c59b0494a51258e2dacf92f9.zip | |
[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>
Diffstat (limited to 'drivers/media/dvb-frontends/dib7000m.c')
| -rw-r--r-- | drivers/media/dvb-frontends/dib7000m.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/dvb-frontends/dib7000m.c b/drivers/media/dvb-frontends/dib7000m.c index 148bf79236fb..dcb9a15ef0c2 100644 --- a/drivers/media/dvb-frontends/dib7000m.c +++ b/drivers/media/dvb-frontends/dib7000m.c @@ -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); |