summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 05:36:15 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-17 06:01:18 -0300
commit3982ccd2b3c455e75b58a01505e0f55bcc686947 (patch)
tree0987b2653b20545337efce97ae37d2ca713f2725 /drivers/media/pci
parentc0d4021f6ca04061f5b17a1468eed666ebe43e67 (diff)
downloadop-kernel-dev-3982ccd2b3c455e75b58a01505e0f55bcc686947.zip
op-kernel-dev-3982ccd2b3c455e75b58a01505e0f55bcc686947.tar.gz
[media] pci: dm1105: Remove redundant pci_set_drvdata
Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/dm1105/dm1105.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index ab797fe..e985e3b 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -1178,7 +1178,6 @@ err_pci_release_regions:
err_pci_disable_device:
pci_disable_device(pdev);
err_kfree:
- pci_set_drvdata(pdev, NULL);
kfree(dev);
return ret;
}
@@ -1211,7 +1210,6 @@ static void dm1105_remove(struct pci_dev *pdev)
pci_iounmap(pdev, dev->io_mem);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
dm1105_devcount--;
kfree(dev);
}
OpenPOWER on IntegriCloud