Merge branch 'linus' into core/softlockup

[linux-2.6] / drivers / mtd / maps / pci.c

diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index 21822c2edbe40126198990635473c902c06e7dc0..d2ab1bae9c346fbf2168ff59199222f226e6f2cb 100644 (file)
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -334,9 +334,6 @@ mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        return 0;
 
 release:
-       if (mtd)
-               map_destroy(mtd);
-
        if (map) {
                map->exit(dev, map);
                kfree(map);