Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[~andy/linux] / drivers / i2c / busses / i2c-pxa-pci.c

diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c
index 3d4985695aed7e0ed92d76aa271f2f4064afcea3..9639be86e53fde1dcf14f03b53f4e2a33d2c9632 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -128,7 +128,6 @@ static int ce4100_i2c_probe(struct pci_dev *dev,
        return 0;
 
 err_dev_add:
-       pci_set_drvdata(dev, NULL);
        kfree(sds);
 err_mem:
        pci_disable_device(dev);
@@ -141,7 +140,6 @@ static void ce4100_i2c_remove(struct pci_dev *dev)
        unsigned int i;
 
        sds = pci_get_drvdata(dev);
-       pci_set_drvdata(dev, NULL);
 
        for (i = 0; i < ARRAY_SIZE(sds->pdev); i++)
                platform_device_unregister(sds->pdev[i]);