summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorAlexandru Juncu <alexj@rosedu.org>2013-09-04 11:41:34 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-31 04:53:40 -0200
commit0e48a3e8f616026195416e5d61c6cf24f686c2d8 (patch)
tree90fc5a39ef02e313bfd944c8790b22c8f37fa72e /drivers/media/pci
parentc656ead48fa5ab4af973f8135400b1695184ef31 (diff)
downloadlinux-0e48a3e8f616026195416e5d61c6cf24f686c2d8.tar.bz2
[media] dm1105: remove unneeded not-null test
i2c_adap is a field of a struct and will always be allocated so its address will never be null. Suggested by coccinelle, manually verified. Signed-off-by: Alexandru Juncu <alexj@rosedu.org> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/dm1105/dm1105.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index e985e3b0f647..e60ac35fc10c 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -1201,8 +1201,7 @@ static void dm1105_remove(struct pci_dev *pdev)
dvb_dmxdev_release(&dev->dmxdev);
dvb_dmx_release(dvbdemux);
dvb_unregister_adapter(dvb_adapter);
- if (&dev->i2c_adap)
- i2c_del_adapter(&dev->i2c_adap);
+ i2c_del_adapter(&dev->i2c_adap);
dm1105_hw_exit(dev);
synchronize_irq(pdev->irq);