Merge remote-tracking branch 'gpio/for-next'

[karo-tx-linux.git] / drivers / gpio / gpio-bt8xx.c

diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c
index 8369e71ebe4f73acdf30051ff32b68812685f15f..9dfe36fd8baff2a56f80db19e369b6716e03a3ef 100644 (file)
--- a/drivers/gpio/gpio-bt8xx.c
+++ b/drivers/gpio/gpio-bt8xx.c
@@ -228,7 +228,6 @@ static int bt8xxgpio_probe(struct pci_dev *dev,
 err_release_mem:
        release_mem_region(pci_resource_start(dev, 0),
                           pci_resource_len(dev, 0));
-       pci_set_drvdata(dev, NULL);
 err_disable:
        pci_disable_device(dev);
 err_freebg:
@@ -252,7 +251,6 @@ static void bt8xxgpio_remove(struct pci_dev *pdev)
                           pci_resource_len(pdev, 0));
        pci_disable_device(pdev);
 
-       pci_set_drvdata(pdev, NULL);
        kfree(bg);
 }