diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2014-11-30 13:05:48 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-04 12:28:51 -0500 |
commit | dc89cfcf33bfd15ad335207062c1f87b6074f222 (patch) | |
tree | 34c2d38cefba33b7c71be709cc0c31c4a10642f5 /drivers/media | |
parent | 99d2fae9eb56a0cba060f28d8a8d154f755dedb2 (diff) |
[media] tuners: remove uneeded checks before release_firmware()
The release_firmware() function tests whether its argument is NULL
and then returns immediately. Thus the test around the call is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/tuners/si2157.c | 3 | ||||
-rw-r--r-- | drivers/media/tuners/xc5000.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 8e576960a1df..e17ab1ffc273 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c | |||
@@ -196,8 +196,7 @@ warm: | |||
196 | return 0; | 196 | return 0; |
197 | 197 | ||
198 | err: | 198 | err: |
199 | if (fw) | 199 | release_firmware(fw); |
200 | release_firmware(fw); | ||
201 | 200 | ||
202 | dev_dbg(&s->client->dev, "failed=%d\n", ret); | 201 | dev_dbg(&s->client->dev, "failed=%d\n", ret); |
203 | return ret; | 202 | return ret; |
diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c index 705c258d1101..2a039de8ab9a 100644 --- a/drivers/media/tuners/xc5000.c +++ b/drivers/media/tuners/xc5000.c | |||
@@ -1336,8 +1336,7 @@ static int xc5000_release(struct dvb_frontend *fe) | |||
1336 | 1336 | ||
1337 | if (priv) { | 1337 | if (priv) { |
1338 | cancel_delayed_work(&priv->timer_sleep); | 1338 | cancel_delayed_work(&priv->timer_sleep); |
1339 | if (priv->firmware) | 1339 | release_firmware(priv->firmware); |
1340 | release_firmware(priv->firmware); | ||
1341 | hybrid_tuner_release_state(priv); | 1340 | hybrid_tuner_release_state(priv); |
1342 | } | 1341 | } |
1343 | 1342 | ||