aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 04:36:17 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-17 05:01:50 -0400
commit1e1159bb97cf4191849b4b03f77ab32977c2ece6 (patch)
tree98cc2c32e035b5a98ad42867477060ece37f5fc9
parent593781e48d65646f9752540405c2ccbc908a7ac6 (diff)
[media] pci: pluto2: 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/pluto2/pluto2.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
index 493828500055..8164d74b46a4 100644
--- a/drivers/media/pci/pluto2/pluto2.c
+++ b/drivers/media/pci/pluto2/pluto2.c
@@ -736,7 +736,6 @@ err_pci_release_regions:
736err_pci_disable_device: 736err_pci_disable_device:
737 pci_disable_device(pdev); 737 pci_disable_device(pdev);
738err_kfree: 738err_kfree:
739 pci_set_drvdata(pdev, NULL);
740 kfree(pluto); 739 kfree(pluto);
741 goto out; 740 goto out;
742} 741}
@@ -765,7 +764,6 @@ static void pluto2_remove(struct pci_dev *pdev)
765 pci_iounmap(pdev, pluto->io_mem); 764 pci_iounmap(pdev, pluto->io_mem);
766 pci_release_regions(pdev); 765 pci_release_regions(pdev);
767 pci_disable_device(pdev); 766 pci_disable_device(pdev);
768 pci_set_drvdata(pdev, NULL);
769 kfree(pluto); 767 kfree(pluto);
770} 768}
771 769