aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 04:36:18 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-17 05:01:59 -0400
commita508db8705ec997092d07231b8aa3c53e348752e (patch)
tree98c139687fcef4f85a2bab0ab5cb72b7b0d45d1f
parent1e1159bb97cf4191849b4b03f77ab32977c2ece6 (diff)
[media] pci: pt1: 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/pt1/pt1.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
index 75ce14229e03..db887b0c37b1 100644
--- a/drivers/media/pci/pt1/pt1.c
+++ b/drivers/media/pci/pt1/pt1.c
@@ -1076,7 +1076,6 @@ static void pt1_remove(struct pci_dev *pdev)
1076 pt1_update_power(pt1); 1076 pt1_update_power(pt1);
1077 pt1_cleanup_adapters(pt1); 1077 pt1_cleanup_adapters(pt1);
1078 i2c_del_adapter(&pt1->i2c_adap); 1078 i2c_del_adapter(&pt1->i2c_adap);
1079 pci_set_drvdata(pdev, NULL);
1080 kfree(pt1); 1079 kfree(pt1);
1081 pci_iounmap(pdev, regs); 1080 pci_iounmap(pdev, regs);
1082 pci_release_regions(pdev); 1081 pci_release_regions(pdev);
@@ -1198,7 +1197,6 @@ err_i2c_del_adapter:
1198err_pt1_cleanup_adapters: 1197err_pt1_cleanup_adapters:
1199 pt1_cleanup_adapters(pt1); 1198 pt1_cleanup_adapters(pt1);
1200err_kfree: 1199err_kfree:
1201 pci_set_drvdata(pdev, NULL);
1202 kfree(pt1); 1200 kfree(pt1);
1203err_pci_iounmap: 1201err_pci_iounmap:
1204 pci_iounmap(pdev, regs); 1202 pci_iounmap(pdev, regs);