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

[karo-tx-linux.git] / drivers / mfd / lpc_ich.c

diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index 9483bc8472a51acbbc45a3f08b6072104a81e027..316af07ede3fd1b0e7f610f15adfff7dcd38fb6b 100644 (file)
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -969,7 +969,6 @@ static int lpc_ich_probe(struct pci_dev *dev,
        if (!cell_added) {
                dev_warn(&dev->dev, "No MFD cells added\n");
                lpc_ich_restore_config_space(dev);
-               pci_set_drvdata(dev, NULL);
                return -ENODEV;
        }
 
@@ -980,7 +979,6 @@ static void lpc_ich_remove(struct pci_dev *dev)
 {
        mfd_remove_devices(&dev->dev);
        lpc_ich_restore_config_space(dev);
-       pci_set_drvdata(dev, NULL);
 }
 
 static struct pci_driver lpc_ich_driver = {