Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: validate late-added resources
  pcmcia: allow for extension of resource interval
  pcmcia: remove useless msleep in ds.c
  pcmcia: use read_cis_mem return value
  pcmcia: handle error in serial_cs config calls
  pcmcia: add locking to pcmcia_{read,write}_cis_mem
  pcmcia: avoid prod_id memleak
  pcmcia: avoid sysfs-related lockup for cardbus
  pcmcia: use state machine for extended requery
  pcmcia: delay re-scanning and re-querying of PCMCIA bus
  pcmcia: use pccardd to handle eject, insert, suspend and resume requests
  pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
  pcmcia: use mutex for dynid lock
  pcmcia: assert locking to struct pcmcia_device
  pcmcia: add locking documentation
  pcmcia: simplify locking
  pcmcia: add locking to struct pcmcia_socket->pcmcia_state()
  pcmcia: protect s->device_count
  pcmcia: properly lock skt->irq, skt->irq_mask
  pcmcia: lock ops->set_socket
  ...

1 files changed, 190 insertions, 143 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 1a4a3c49cc15..0f98be4450b7 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -42,8 +42,6 @@ MODULE_DESCRIPTION("PCMCIA Driver Services");
 MODULE_LICENSE("GPL");
 
 
-spinlock_t pcmcia_dev_list_lock;
-
 /*====================================================================*/
 
 static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
@@ -126,9 +124,9 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
         dynid->id.device_no = device_no;
         memcpy(dynid->id.prod_id_hash, prod_id_hash, sizeof(__u32) * 4);
 
-        spin_lock(&pdrv->dynids.lock);
+        mutex_lock(&pdrv->dynids.lock);
         list_add_tail(&dynid->node, &pdrv->dynids.list);
-        spin_unlock(&pdrv->dynids.lock);
+        mutex_unlock(&pdrv->dynids.lock);
 
         if (get_driver(&pdrv->drv)) {
                 retval = driver_attach(&pdrv->drv);
@@ -146,12 +144,12 @@ pcmcia_free_dynids(struct pcmcia_driver *drv)
 {
         struct pcmcia_dynid *dynid, *n;
 
-        spin_lock(&drv->dynids.lock);
+        mutex_lock(&drv->dynids.lock);
         list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) {
                 list_del(&dynid->node);
                 kfree(dynid);
         }
-        spin_unlock(&drv->dynids.lock);
+        mutex_unlock(&drv->dynids.lock);
 }
 
 static int
@@ -182,7 +180,7 @@ int pcmcia_register_driver(struct pcmcia_driver *driver)
         /* initialize common fields */
         driver->drv.bus = &pcmcia_bus_type;
         driver->drv.owner = driver->owner;
-        spin_lock_init(&driver->dynids.lock);
+        mutex_init(&driver->dynids.lock);
         INIT_LIST_HEAD(&driver->dynids.list);
 
         pr_debug("registering driver %s\n", driver->drv.name);
@@ -239,30 +237,21 @@ static void pcmcia_release_function(struct kref *ref)
 static void pcmcia_release_dev(struct device *dev)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
+        int i;
         dev_dbg(dev, "releasing device\n");
         pcmcia_put_socket(p_dev->socket);
+        for (i = 0; i < 4; i++)
+                kfree(p_dev->prod_id[i]);
         kfree(p_dev->devname);
         kref_put(&p_dev->function_config->ref, pcmcia_release_function);
         kfree(p_dev);
 }
 
-static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)
-{
-        if (!s->pcmcia_state.device_add_pending) {
-                dev_dbg(&s->dev, "scheduling to add %s secondary"
-                       " device to %d\n", mfc ? "mfc" : "pfc", s->sock);
-                s->pcmcia_state.device_add_pending = 1;
-                s->pcmcia_state.mfc_pfc = mfc;
-                schedule_work(&s->device_add);
-        }
-        return;
-}
 
 static int pcmcia_device_probe(struct device *dev)
 {
         struct pcmcia_device *p_dev;
         struct pcmcia_driver *p_drv;
-        struct pcmcia_device_id *did;
         struct pcmcia_socket *s;
         cistpl_config_t cis_config;
         int ret = 0;
@@ -275,18 +264,6 @@ static int pcmcia_device_probe(struct device *dev)
         p_drv = to_pcmcia_drv(dev->driver);
         s = p_dev->socket;
 
-        /* The PCMCIA code passes the match data in via dev_set_drvdata(dev)
-         * which is an ugly hack. Once the driver probe is called it may
-         * and often will overwrite the match data so we must save it first
-         *
-         * handle pseudo multifunction devices:
-         * there are at most two pseudo multifunction devices.
-         * if we're matching against the first, schedule a
-         * call which will then check whether there are two
-         * pseudo devices, and if not, add the second one.
-         */
-        did = dev_get_drvdata(&p_dev->dev);
-
         dev_dbg(dev, "trying to bind to %s\n", p_drv->drv.name);
 
         if ((!p_drv->probe) || (!p_dev->function_config) ||
@@ -315,9 +292,11 @@ static int pcmcia_device_probe(struct device *dev)
                 goto put_module;
         }
 
-        if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
+        mutex_lock(&s->ops_mutex);
+        if ((s->pcmcia_state.has_pfc) &&
             (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
-                pcmcia_add_device_later(p_dev->socket, 0);
+                pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY);
+        mutex_unlock(&s->ops_mutex);
 
 put_module:
         if (ret)
@@ -336,26 +315,27 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
 {
         struct pcmcia_device    *p_dev;
         struct pcmcia_device    *tmp;
-        unsigned long           flags;
 
         dev_dbg(leftover ? &leftover->dev : &s->dev,
                    "pcmcia_card_remove(%d) %s\n", s->sock,
                    leftover ? leftover->devname : "");
 
+        mutex_lock(&s->ops_mutex);
         if (!leftover)
                 s->device_count = 0;
         else
                 s->device_count = 1;
+        mutex_unlock(&s->ops_mutex);
 
         /* unregister all pcmcia_devices registered with this socket, except leftover */
         list_for_each_entry_safe(p_dev, tmp, &s->devices_list, socket_device_list) {
                 if (p_dev == leftover)
                         continue;
 
-                spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
+                mutex_lock(&s->ops_mutex);
                 list_del(&p_dev->socket_device_list);
                 p_dev->_removed = 1;
-                spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+                mutex_unlock(&s->ops_mutex);
 
                 dev_dbg(&p_dev->dev, "unregistering device\n");
                 device_unregister(&p_dev->dev);
@@ -368,7 +348,6 @@ static int pcmcia_device_remove(struct device *dev)
 {
         struct pcmcia_device *p_dev;
         struct pcmcia_driver *p_drv;
-        struct pcmcia_device_id *did;
         int i;
 
         p_dev = to_pcmcia_dev(dev);
@@ -380,9 +359,8 @@ static int pcmcia_device_remove(struct device *dev)
          * pseudo multi-function card, we need to unbind
          * all devices
          */
-        did = dev_get_drvdata(&p_dev->dev);
-        if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
-            (p_dev->socket->device_count != 0) &&
+        if ((p_dev->socket->pcmcia_state.has_pfc) &&
+            (p_dev->socket->device_count > 0) &&
             (p_dev->device_no == 0))
                 pcmcia_card_remove(p_dev->socket, p_dev);
 
@@ -431,16 +409,20 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
 
         if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL,
                                CISTPL_MANFID, &manf_id)) {
+                mutex_lock(&p_dev->socket->ops_mutex);
                 p_dev->manf_id = manf_id.manf;
                 p_dev->card_id = manf_id.card;
                 p_dev->has_manf_id = 1;
                 p_dev->has_card_id = 1;
+                mutex_unlock(&p_dev->socket->ops_mutex);
         }
 
         if (!pccard_read_tuple(p_dev->socket, p_dev->func,
                                CISTPL_FUNCID, &func_id)) {
+                mutex_lock(&p_dev->socket->ops_mutex);
                 p_dev->func_id = func_id.func;
                 p_dev->has_func_id = 1;
+                mutex_unlock(&p_dev->socket->ops_mutex);
         } else {
                 /* rule of thumb: cards with no FUNCID, but with
                  * common memory device geometry information, are
@@ -457,17 +439,21 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
                         dev_dbg(&p_dev->dev,
                                    "mem device geometry probably means "
                                    "FUNCID_MEMORY\n");
+                        mutex_lock(&p_dev->socket->ops_mutex);
                         p_dev->func_id = CISTPL_FUNCID_MEMORY;
                         p_dev->has_func_id = 1;
+                        mutex_unlock(&p_dev->socket->ops_mutex);
                 }
                 kfree(devgeo);
         }
 
         if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL, CISTPL_VERS_1,
                                vers1)) {
+                mutex_lock(&p_dev->socket->ops_mutex);
                 for (i = 0; i < min_t(unsigned int, 4, vers1->ns); i++) {
                         char *tmp;
                         unsigned int length;
+                        char *new;
 
                         tmp = vers1->str + vers1->ofs[i];
 
@@ -475,14 +461,17 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
                         if ((length < 2) || (length > 255))
                                 continue;
 
-                        p_dev->prod_id[i] = kmalloc(sizeof(char) * length,
-                                                    GFP_KERNEL);
-                        if (!p_dev->prod_id[i])
+                        new = kmalloc(sizeof(char) * length, GFP_KERNEL);
+                        if (!new)
                                 continue;
 
-                        p_dev->prod_id[i] = strncpy(p_dev->prod_id[i],
-                                                    tmp, length);
+                        new = strncpy(new, tmp, length);
+
+                        tmp = p_dev->prod_id[i];
+                        p_dev->prod_id[i] = new;
+                        kfree(tmp);
                 }
+                mutex_unlock(&p_dev->socket->ops_mutex);
         }
 
         kfree(vers1);
@@ -502,7 +491,7 @@ static DEFINE_MUTEX(device_add_lock);
 struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int function)
 {
         struct pcmcia_device *p_dev, *tmp_dev;
-        unsigned long flags;
+        int i;
 
         s = pcmcia_get_socket(s);
         if (!s)
@@ -512,16 +501,19 @@ struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int fu
 
         pr_debug("adding device to %d, function %d\n", s->sock, function);
 
-        /* max of 4 devices per card */
-        if (s->device_count == 4)
-                goto err_put;
-
         p_dev = kzalloc(sizeof(struct pcmcia_device), GFP_KERNEL);
         if (!p_dev)
                 goto err_put;
 
-        p_dev->socket = s;
+        mutex_lock(&s->ops_mutex);
         p_dev->device_no = (s->device_count++);
+        mutex_unlock(&s->ops_mutex);
+
+        /* max of 2 devices per card */
+        if (p_dev->device_no >= 2)
+                goto err_free;
+
+        p_dev->socket = s;
         p_dev->func   = function;
 
         p_dev->dev.bus = &pcmcia_bus_type;
@@ -538,7 +530,7 @@ struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int fu
                 goto err_free;
         dev_dbg(&p_dev->dev, "devname is %s\n", p_dev->devname);
 
-        spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
+        mutex_lock(&s->ops_mutex);
 
         /*
          * p_dev->function_config must be the same for all card functions.
@@ -556,7 +548,7 @@ struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int fu
         /* Add to the list in pcmcia_bus_socket */
         list_add(&p_dev->socket_device_list, &s->devices_list);
 
-        spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+        mutex_unlock(&s->ops_mutex);
 
         if (!p_dev->function_config) {
                 dev_dbg(&p_dev->dev, "creating config_t\n");
@@ -581,14 +573,19 @@ struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int fu
         return p_dev;
 
  err_unreg:
-        spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
+        mutex_lock(&s->ops_mutex);
         list_del(&p_dev->socket_device_list);
-        spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+        mutex_unlock(&s->ops_mutex);
 
  err_free:
+        mutex_lock(&s->ops_mutex);
+        s->device_count--;
+        mutex_unlock(&s->ops_mutex);
+
+        for (i = 0; i < 4; i++)
+                kfree(p_dev->prod_id[i]);
         kfree(p_dev->devname);
         kfree(p_dev);
-        s->device_count--;
  err_put:
         mutex_unlock(&device_add_lock);
         pcmcia_put_socket(s);
@@ -601,19 +598,23 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
 {
         cistpl_longlink_mfc_t mfc;
         unsigned int no_funcs, i, no_chains;
-        int ret = 0;
+        int ret = -EAGAIN;
 
+        mutex_lock(&s->ops_mutex);
         if (!(s->resource_setup_done)) {
                 dev_dbg(&s->dev,
                            "no resources available, delaying card_add\n");
+                mutex_unlock(&s->ops_mutex);
                 return -EAGAIN; /* try again, but later... */
         }
 
         if (pcmcia_validate_mem(s)) {
                 dev_dbg(&s->dev, "validating mem resources failed, "
                        "delaying card_add\n");
+                mutex_unlock(&s->ops_mutex);
                 return -EAGAIN; /* try again, but later... */
         }
+        mutex_unlock(&s->ops_mutex);
 
         ret = pccard_validate_cis(s, &no_chains);
         if (ret || !no_chains) {
@@ -634,17 +635,7 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
 }
 
 
-static void pcmcia_delayed_add_device(struct work_struct *work)
-{
-        struct pcmcia_socket *s =
-                container_of(work, struct pcmcia_socket, device_add);
-        dev_dbg(&s->dev, "adding additional device to %d\n", s->sock);
-        pcmcia_device_add(s, s->pcmcia_state.mfc_pfc);
-        s->pcmcia_state.device_add_pending = 0;
-        s->pcmcia_state.mfc_pfc = 0;
-}
-
-static int pcmcia_requery(struct device *dev, void * _data)
+static int pcmcia_requery_callback(struct device *dev, void * _data)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         if (!p_dev->dev.driver) {
@@ -655,45 +646,67 @@ static int pcmcia_requery(struct device *dev, void * _data)
         return 0;
 }
 
-static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis)
-{
-        int no_devices = 0;
-        int ret = 0;
-        unsigned long flags;
 
-        /* must be called with skt_mutex held */
-        dev_dbg(&skt->dev, "re-scanning socket %d\n", skt->sock);
+static void pcmcia_requery(struct pcmcia_socket *s)
+{
+        int present, has_pfc;
 
-        spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
-        if (list_empty(&skt->devices_list))
-                no_devices = 1;
-        spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+        mutex_lock(&s->ops_mutex);
+        present = s->pcmcia_state.present;
+        mutex_unlock(&s->ops_mutex);
 
-        /* If this is because of a CIS override, start over */
-        if (new_cis && !no_devices)
-                pcmcia_card_remove(skt, NULL);
+        if (!present)
+                return;
 
-        /* if no devices were added for this socket yet because of
-         * missing resource information or other trouble, we need to
-         * do this now. */
-        if (no_devices || new_cis) {
-                ret = pcmcia_card_add(skt);
-                if (ret)
-                        return;
+        if (s->functions == 0) {
+                pcmcia_card_add(s);
+                return;
         }
 
         /* some device information might have changed because of a CIS
          * update or because we can finally read it correctly... so
          * determine it again, overwriting old values if necessary. */
-        bus_for_each_dev(&pcmcia_bus_type, NULL, NULL, pcmcia_requery);
+        bus_for_each_dev(&pcmcia_bus_type, NULL, NULL, pcmcia_requery_callback);
+
+        /* if the CIS changed, we need to check whether the number of
+         * functions changed. */
+        if (s->fake_cis) {
+                int old_funcs, new_funcs;
+                cistpl_longlink_mfc_t mfc;
+
+                /* does this cis override add or remove functions? */
+                old_funcs = s->functions;
+
+                if (!pccard_read_tuple(s, BIND_FN_ALL, CISTPL_LONGLINK_MFC,
+                                        &mfc))
+                        new_funcs = mfc.nfn;
+                else
+                        new_funcs = 1;
+                if (old_funcs > new_funcs) {
+                        pcmcia_card_remove(s, NULL);
+                        pcmcia_card_add(s);
+                } else if (new_funcs > old_funcs) {
+                        s->functions = new_funcs;
+                        pcmcia_device_add(s, 1);
+                }
+        }
+
+        /* If the PCMCIA device consists of two pseudo devices,
+         * call pcmcia_device_add() -- which will fail if both
+         * devices are already registered. */
+        mutex_lock(&s->ops_mutex);
+        has_pfc = s->pcmcia_state.has_pfc;
+        mutex_unlock(&s->ops_mutex);
+        if (has_pfc)
+                pcmcia_device_add(s, 0);
 
         /* we re-scan all devices, not just the ones connected to this
          * socket. This does not matter, though. */
-        ret = bus_rescan_devices(&pcmcia_bus_type);
-        if (ret)
-                printk(KERN_INFO "pcmcia: bus_rescan_devices failed\n");
+        if (bus_rescan_devices(&pcmcia_bus_type))
+                dev_warn(&s->dev, "rescanning the bus failed\n");
 }
 
+
 #ifdef CONFIG_PCMCIA_LOAD_CIS
 
 /**
@@ -710,9 +723,6 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
         struct pcmcia_socket *s = dev->socket;
         const struct firmware *fw;
         int ret = -ENOMEM;
-        int no_funcs;
-        int old_funcs;
-        cistpl_longlink_mfc_t mfc;
 
         if (!filename)
                 return -EINVAL;
@@ -739,19 +749,8 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
                 /* update information */
                 pcmcia_device_query(dev);
 
-                /* does this cis override add or remove functions? */
-                old_funcs = s->functions;
-
-                if (!pccard_read_tuple(s, BIND_FN_ALL, CISTPL_LONGLINK_MFC, &mfc))
-                        no_funcs = mfc.nfn;
-                else
-                        no_funcs = 1;
-                s->functions = no_funcs;
-
-                if (old_funcs > no_funcs)
-                        pcmcia_card_remove(s, dev);
-                else if (no_funcs > old_funcs)
-                        pcmcia_add_device_later(s, 1);
+                /* requery (as number of functions might have changed) */
+                pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY);
         }
  release:
         release_firmware(fw);
@@ -818,9 +817,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
         if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) {
                 if (dev->device_no != did->device_no)
                         return 0;
+                mutex_lock(&dev->socket->ops_mutex);
+                dev->socket->pcmcia_state.has_pfc = 1;
+                mutex_unlock(&dev->socket->ops_mutex);
         }
 
         if (did->match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID) {
+                int ret;
+
                 if ((!dev->has_func_id) || (dev->func_id != did->func_id))
                         return 0;
 
@@ -835,10 +839,15 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
                  * after it has re-checked that there is no possible module
                  * with a prod_id/manf_id/card_id match.
                  */
-                dev_dbg(&dev->dev,
-                        "skipping FUNC_ID match until userspace interaction\n");
-                if (!dev->allow_func_id_match)
+                mutex_lock(&dev->socket->ops_mutex);
+                ret = dev->allow_func_id_match;
+                mutex_unlock(&dev->socket->ops_mutex);
+
+                if (!ret) {
+                        dev_dbg(&dev->dev,
+                                "skipping FUNC_ID match until userspace ACK\n");
                         return 0;
+                }
         }
 
         if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
@@ -859,8 +868,6 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
                         return 0;
         }
 
-        dev_set_drvdata(&dev->dev, did);
-
         return 1;
 }
 
@@ -873,16 +880,16 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
         struct pcmcia_dynid *dynid;
 
         /* match dynamic devices first */
-        spin_lock(&p_drv->dynids.lock);
+        mutex_lock(&p_drv->dynids.lock);
         list_for_each_entry(dynid, &p_drv->dynids.list, node) {
                 dev_dbg(dev, "trying to match to %s\n", drv->name);
                 if (pcmcia_devmatch(p_dev, &dynid->id)) {
                         dev_dbg(dev, "matched to %s\n", drv->name);
-                        spin_unlock(&p_drv->dynids.lock);
+                        mutex_unlock(&p_drv->dynids.lock);
                         return 1;
                 }
         }
-        spin_unlock(&p_drv->dynids.lock);
+        mutex_unlock(&p_drv->dynids.lock);
 
 #ifdef CONFIG_PCMCIA_IOCTL
         /* matching by cardmgr */
@@ -970,13 +977,14 @@ static int runtime_suspend(struct device *dev)
         return rc;
 }
 
-static void runtime_resume(struct device *dev)
+static int runtime_resume(struct device *dev)
 {
         int rc;
 
         down(&dev->sem);
         rc = pcmcia_dev_resume(dev);
         up(&dev->sem);
+        return rc;
 }
 
 /************************ per-device sysfs output ***************************/
@@ -1027,7 +1035,7 @@ static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute
         if ((!p_dev->suspended) && !strncmp(buf, "off", 3))
                 ret = runtime_suspend(dev);
         else if (p_dev->suspended && !strncmp(buf, "on", 2))
-                runtime_resume(dev);
+                ret = runtime_resume(dev);
 
         return ret ? ret : count;
 }
@@ -1059,19 +1067,14 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
-        int ret;
 
         if (!count)
                 return -EINVAL;
 
-        mutex_lock(&p_dev->socket->skt_mutex);
+        mutex_lock(&p_dev->socket->ops_mutex);
         p_dev->allow_func_id_match = 1;
-        mutex_unlock(&p_dev->socket->skt_mutex);
-
-        ret = bus_rescan_devices(&pcmcia_bus_type);
-        if (ret)
-                printk(KERN_INFO "pcmcia: bus_rescan_devices failed after "
-                       "allowing func_id matches\n");
+        mutex_unlock(&p_dev->socket->ops_mutex);
+        pcmcia_parse_uevents(p_dev->socket, PCMCIA_UEVENT_REQUERY);
 
         return count;
 }
@@ -1099,8 +1102,13 @@ static int pcmcia_dev_suspend(struct device *dev, pm_message_t state)
         struct pcmcia_driver *p_drv = NULL;
         int ret = 0;
 
-        if (p_dev->suspended)
+        mutex_lock(&p_dev->socket->ops_mutex);
+        if (p_dev->suspended) {
+                mutex_unlock(&p_dev->socket->ops_mutex);
                 return 0;
+        }
+        p_dev->suspended = 1;
+        mutex_unlock(&p_dev->socket->ops_mutex);
 
         dev_dbg(dev, "suspending\n");
 
@@ -1117,6 +1125,9 @@ static int pcmcia_dev_suspend(struct device *dev, pm_message_t state)
                                    "pcmcia: device %s (driver %s) did "
                                    "not want to go to sleep (%d)\n",
                                    p_dev->devname, p_drv->drv.name, ret);
+                        mutex_lock(&p_dev->socket->ops_mutex);
+                        p_dev->suspended = 0;
+                        mutex_unlock(&p_dev->socket->ops_mutex);
                         goto out;
                 }
         }
@@ -1127,8 +1138,6 @@ static int pcmcia_dev_suspend(struct device *dev, pm_message_t state)
         }
 
  out:
-        if (!ret)
-                p_dev->suspended = 1;
         return ret;
 }
 
@@ -1139,8 +1148,13 @@ static int pcmcia_dev_resume(struct device *dev)
         struct pcmcia_driver *p_drv = NULL;
         int ret = 0;
 
-        if (!p_dev->suspended)
+        mutex_lock(&p_dev->socket->ops_mutex);
+        if (!p_dev->suspended) {
+                mutex_unlock(&p_dev->socket->ops_mutex);
                 return 0;
+        }
+        p_dev->suspended = 0;
+        mutex_unlock(&p_dev->socket->ops_mutex);
 
         dev_dbg(dev, "resuming\n");
 
@@ -1161,8 +1175,6 @@ static int pcmcia_dev_resume(struct device *dev)
                 ret = p_drv->resume(p_dev);
 
  out:
-        if (!ret)
-                p_dev->suspended = 0;
         return ret;
 }
 
@@ -1237,13 +1249,22 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
 
         switch (event) {
         case CS_EVENT_CARD_REMOVAL:
+                mutex_lock(&s->ops_mutex);
                 s->pcmcia_state.present = 0;
+                mutex_unlock(&s->ops_mutex);
                 pcmcia_card_remove(skt, NULL);
                 handle_event(skt, event);
+                mutex_lock(&s->ops_mutex);
+                destroy_cis_cache(s);
+                mutex_unlock(&s->ops_mutex);
                 break;
 
         case CS_EVENT_CARD_INSERTION:
+                mutex_lock(&s->ops_mutex);
+                s->pcmcia_state.has_pfc = 0;
                 s->pcmcia_state.present = 1;
+                destroy_cis_cache(s); /* to be on the safe side... */
+                mutex_unlock(&s->ops_mutex);
                 pcmcia_card_add(skt);
                 handle_event(skt, event);
                 break;
@@ -1251,8 +1272,24 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
         case CS_EVENT_EJECTION_REQUEST:
                 break;
 
-        case CS_EVENT_PM_SUSPEND:
         case CS_EVENT_PM_RESUME:
+                if (verify_cis_cache(skt) != 0) {
+                        dev_dbg(&skt->dev, "cis mismatch - different card\n");
+                        /* first, remove the card */
+                        ds_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH);
+                        mutex_lock(&s->ops_mutex);
+                        destroy_cis_cache(skt);
+                        kfree(skt->fake_cis);
+                        skt->fake_cis = NULL;
+                        mutex_unlock(&s->ops_mutex);
+                        /* now, add the new card */
+                        ds_event(skt, CS_EVENT_CARD_INSERTION,
+                                 CS_EVENT_PRI_LOW);
+                }
+                handle_event(skt, event);
+                break;
+
+        case CS_EVENT_PM_SUSPEND:
         case CS_EVENT_RESET_PHYSICAL:
         case CS_EVENT_CARD_RESET:
         default:
@@ -1275,9 +1312,13 @@ struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev)
         if (!p_dev)
                 return NULL;
 
+        mutex_lock(&p_dev->socket->ops_mutex);
         if (!p_dev->socket->pcmcia_state.present)
                 goto out;
 
+        if (p_dev->socket->pcmcia_state.dead)
+                goto out;
+
         if (p_dev->_removed)
                 goto out;
 
@@ -1286,6 +1327,7 @@ struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev)
 
         ret = p_dev;
  out:
+        mutex_unlock(&p_dev->socket->ops_mutex);
         pcmcia_put_dev(p_dev);
         return ret;
 }
@@ -1295,7 +1337,8 @@ EXPORT_SYMBOL(pcmcia_dev_present);
 static struct pcmcia_callback pcmcia_bus_callback = {
         .owner = THIS_MODULE,
         .event = ds_event,
-        .requery = pcmcia_bus_rescan,
+        .requery = pcmcia_requery,
+        .validate = pccard_validate_cis,
         .suspend = pcmcia_bus_suspend,
         .resume = pcmcia_bus_resume,
 };
@@ -1313,17 +1356,17 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
                 return -ENODEV;
         }
 
-        /*
-         * Ugly. But we want to wait for the socket threads to have started up.
-         * We really should let the drivers themselves drive some of this..
-         */
-        msleep(250);
+        ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
+        if (ret) {
+                dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
+                pcmcia_put_socket(socket);
+                return ret;
+        }
 
 #ifdef CONFIG_PCMCIA_IOCTL
         init_waitqueue_head(&socket->queue);
 #endif
         INIT_LIST_HEAD(&socket->devices_list);
-        INIT_WORK(&socket->device_add, pcmcia_delayed_add_device);
         memset(&socket->pcmcia_state, 0, sizeof(u8));
         socket->device_count = 0;
 
@@ -1345,14 +1388,20 @@ static void pcmcia_bus_remove_socket(struct device *dev,
         if (!socket)
                 return;
 
+        mutex_lock(&socket->ops_mutex);
         socket->pcmcia_state.dead = 1;
+        mutex_unlock(&socket->ops_mutex);
+
         pccard_register_pcmcia(socket, NULL);
 
         /* unregister any unbound devices */
         mutex_lock(&socket->skt_mutex);
         pcmcia_card_remove(socket, NULL);
+        release_cis_mem(socket);
         mutex_unlock(&socket->skt_mutex);
 
+        sysfs_remove_bin_file(&dev->kobj, &pccard_cis_attr);
+
         pcmcia_put_socket(socket);
 
         return;
@@ -1383,8 +1432,6 @@ static int __init init_pcmcia_bus(void)
 {
         int ret;
 
-        spin_lock_init(&pcmcia_dev_list_lock);
-
         ret = bus_register(&pcmcia_bus_type);
         if (ret < 0) {
                 printk(KERN_WARNING "pcmcia: bus_register error: %d\n", ret);