aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-12-02 04:43:13 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-27 17:25:38 -0500
commit1d6ca29db8b1f213de880b10ac28aed0a19c1d4a (patch)
tree61601634e9ce7d83fcc234d4683a00e007dfdcb9
parent081416e62d516a6412225751c9c4a3807b2374b9 (diff)
[media] mantis: cleanup NULL checking in mantis_ca_exit()
Smatch complainst that the call to mantis_evmgr_exit() dereferences "ca" but then we check it for NULL on the next line. I've moved the NULL check forward to avoid that. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/pci/mantis/mantis_ca.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/pci/mantis/mantis_ca.c b/drivers/media/pci/mantis/mantis_ca.c
index 3d7046909009..60c6c2f24066 100644
--- a/drivers/media/pci/mantis/mantis_ca.c
+++ b/drivers/media/pci/mantis/mantis_ca.c
@@ -198,11 +198,12 @@ void mantis_ca_exit(struct mantis_pci *mantis)
198 struct mantis_ca *ca = mantis->mantis_ca; 198 struct mantis_ca *ca = mantis->mantis_ca;
199 199
200 dprintk(MANTIS_DEBUG, 1, "Mantis CA exit"); 200 dprintk(MANTIS_DEBUG, 1, "Mantis CA exit");
201 if (!ca)
202 return;
201 203
202 mantis_evmgr_exit(ca); 204 mantis_evmgr_exit(ca);
203 dprintk(MANTIS_ERROR, 1, "Unregistering EN50221 device"); 205 dprintk(MANTIS_ERROR, 1, "Unregistering EN50221 device");
204 if (ca) 206 dvb_ca_en50221_release(&ca->en50221);
205 dvb_ca_en50221_release(&ca->en50221);
206 207
207 kfree(ca); 208 kfree(ca);
208} 209}