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

[karo-tx-linux.git] / drivers / pnp / driver.c

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 4e57d3370368f597bb27ed4bcc4693153ce0e0de..63452f20e3e97e5f567cec533ac74a4ab100ebf8 100644 (file)
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -58,23 +58,22 @@ static const struct pnp_device_id *match_device(struct pnp_driver *drv,
 
 int pnp_device_attach(struct pnp_dev *pnp_dev)
 {
-       spin_lock(&pnp_lock);
+       mutex_lock(&pnp_lock);
        if (pnp_dev->status != PNP_READY) {
-               spin_unlock(&pnp_lock);
+               mutex_unlock(&pnp_lock);
                return -EBUSY;
        }
        pnp_dev->status = PNP_ATTACHED;
-       spin_unlock(&pnp_lock);
+       mutex_unlock(&pnp_lock);
        return 0;
 }
 
 void pnp_device_detach(struct pnp_dev *pnp_dev)
 {
-       spin_lock(&pnp_lock);
+       mutex_lock(&pnp_lock);
        if (pnp_dev->status == PNP_ATTACHED)
                pnp_dev->status = PNP_READY;
-       spin_unlock(&pnp_lock);
-       pnp_disable_dev(pnp_dev);
+       mutex_unlock(&pnp_lock);
 }
 
 static int pnp_device_probe(struct device *dev)
@@ -131,6 +130,11 @@ static int pnp_device_remove(struct device *dev)
                        drv->remove(pnp_dev);
                pnp_dev->driver = NULL;
        }
+
+       if (pnp_dev->active &&
+           (!drv || !(drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)))
+               pnp_disable_dev(pnp_dev);
+
        pnp_device_detach(pnp_dev);
        return 0;
 }