projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
593781e
)
[media] pci: pluto2: Remove redundant pci_set_drvdata
author
Sachin Kamat
<sachin.kamat@linaro.org>
Fri, 20 Sep 2013 08:36:17 +0000
(
05:36
-0300)
committer
Mauro Carvalho Chehab
<m.chehab@samsung.com>
Thu, 17 Oct 2013 09:01:50 +0000
(06:01 -0300)
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>
drivers/media/pci/pluto2/pluto2.c
patch
|
blob
|
history
diff --git
a/drivers/media/pci/pluto2/pluto2.c
b/drivers/media/pci/pluto2/pluto2.c
index 493828500055297328376740a4e2a58d40a57a16..8164d74b46a4590af0db79f56bd8c41bacead624 100644
(file)
--- a/
drivers/media/pci/pluto2/pluto2.c
+++ b/
drivers/media/pci/pluto2/pluto2.c
@@
-736,7
+736,6
@@
err_pci_release_regions:
err_pci_disable_device:
pci_disable_device(pdev);
err_kfree:
- pci_set_drvdata(pdev, NULL);
kfree(pluto);
goto out;
}
@@
-765,7
+764,6
@@
static void pluto2_remove(struct pci_dev *pdev)
pci_iounmap(pdev, pluto->io_mem);
pci_release_regions(pdev);
pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
kfree(pluto);
}