From: Markus Elfring Date: Sun, 30 Nov 2014 21:50:20 +0000 (-0300) Subject: [media] ddbridge: remove unneeded check before dvb_unregister_device() X-Git-Tag: firefly_0821_release~176^2~2474^2~36 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddc0085e915f34fe56407dfc3ef2362f572d3a09;p=firefly-linux-kernel-4.4.55.git [media] ddbridge: remove unneeded check before dvb_unregister_device() The dvb_unregister_device() 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index c82e855a0814..9e3492e20766 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -1118,8 +1118,7 @@ static void ddb_ports_detach(struct ddb *dev) dvb_input_detach(port->input[1]); break; case DDB_PORT_CI: - if (port->output->dev) - dvb_unregister_device(port->output->dev); + dvb_unregister_device(port->output->dev); if (port->en) { ddb_input_stop(port->input[0]); ddb_output_stop(port->output);