4 files changed, 14 insertions, 18 deletions

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 9a58862f1401..6e75153c5b4f 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -108,5 +108,5 @@ void cb_free(struct pcmcia_socket *s)
         struct pci_dev *bridge = s->cb_dev;
 
         if (bridge)
-                pci_remove_behind_bridge(bridge);
+                pci_stop_and_remove_behind_bridge(bridge);
 }
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 749c2a16012c..079629bff957 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -127,10 +127,7 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
         list_add_tail(&dynid->node, &pdrv->dynids.list);
         mutex_unlock(&pdrv->dynids.lock);
 
-        if (get_driver(&pdrv->drv)) {
-                retval = driver_attach(&pdrv->drv);
-                put_driver(&pdrv->drv);
-        }
+        retval = driver_attach(&pdrv->drv);
 
         if (retval)
                 return retval;
@@ -160,6 +157,11 @@ pcmcia_create_newid_file(struct pcmcia_driver *drv)
         return error;
 }
 
+static void
+pcmcia_remove_newid_file(struct pcmcia_driver *drv)
+{
+        driver_remove_file(&drv->drv, &driver_attr_new_id);
+}
 
 /**
  * pcmcia_register_driver - register a PCMCIA driver with the bus core
@@ -204,6 +206,7 @@ EXPORT_SYMBOL(pcmcia_register_driver);
 void pcmcia_unregister_driver(struct pcmcia_driver *driver)
 {
         pr_debug("unregistering driver %s\n", driver->name);
+        pcmcia_remove_newid_file(driver);
         driver_unregister(&driver->drv);
         pcmcia_free_dynids(driver);
 }
@@ -1269,10 +1272,8 @@ static int pcmcia_bus_add(struct pcmcia_socket *skt)
 
 static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
 {
-        if (!verify_cis_cache(skt)) {
-                pcmcia_put_socket(skt);
+        if (!verify_cis_cache(skt))
                 return 0;
-        }
 
         dev_dbg(&skt->dev, "cis mismatch - different card\n");
 
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 18474f046e7b..66a54222bbf4 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -325,21 +325,15 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
                         goto err1;
         }
 
-        if (ret) {
-                while (--i >= 0)
-                        soc_pcmcia_remove_one(&sinfo->skt[i]);
-                kfree(sinfo);
-                clk_put(clk);
-        } else {
-                pxa2xx_configure_sockets(&dev->dev);
-                dev_set_drvdata(&dev->dev, sinfo);
-        }
+        pxa2xx_configure_sockets(&dev->dev);
+        dev_set_drvdata(&dev->dev, sinfo);
 
         return 0;
 
 err1:
         while (--i >= 0)
                 soc_pcmcia_remove_one(&sinfo->skt[i]);
+        clk_put(clk);
         kfree(sinfo);
 err0:
         return ret;
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 7510d506b8c3..ef5848f65241 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -177,7 +177,8 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
 
         dev_set_drvdata(&dev->dev, NULL);
 
-        for (; next = s->next, s; s = next) {
+        for (; s; s = next) {
+                next = s->next;
                 soc_pcmcia_remove_one(&s->soc);
                 kfree(s);
         }