aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 04:36:15 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-17 05:01:18 -0400
commit3982ccd2b3c455e75b58a01505e0f55bcc686947 (patch)
tree0987b2653b20545337efce97ae37d2ca713f2725
parentc0d4021f6ca04061f5b17a1468eed666ebe43e67 (diff)
[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>
-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 ab797fe466d2..e985e3b0f647 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -1178,7 +1178,6 @@ err_pci_release_regions:
1178err_pci_disable_device: 1178err_pci_disable_device:
1179 pci_disable_device(pdev); 1179 pci_disable_device(pdev);
1180err_kfree: 1180err_kfree:
1181 pci_set_drvdata(pdev, NULL);
1182 kfree(dev); 1181 kfree(dev);
1183 return ret; 1182 return ret;
1184} 1183}
@@ -1211,7 +1210,6 @@ static void dm1105_remove(struct pci_dev *pdev)
1211 pci_iounmap(pdev, dev->io_mem); 1210 pci_iounmap(pdev, dev->io_mem);
1212 pci_release_regions(pdev); 1211 pci_release_regions(pdev);
1213 pci_disable_device(pdev); 1212 pci_disable_device(pdev);
1214 pci_set_drvdata(pdev, NULL);
1215 dm1105_devcount--; 1213 dm1105_devcount--;
1216 kfree(dev); 1214 kfree(dev);
1217} 1215}