From: Sachin Kamat Date: Fri, 20 Sep 2013 08:36:17 +0000 (-0300) Subject: [media] pci: pluto2: Remove redundant pci_set_drvdata X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e1159bb97cf4191849b4b03f77ab32977c2ece6;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] pci: pluto2: Remove redundant pci_set_drvdata Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- 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: 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); }