Merge tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / pnp / driver.c

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 4e57d3370368f597bb27ed4bcc4693153ce0e0de..153a493b5413e06482dd9909bf0301e6d26eae1f 100644 (file)
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -58,22 +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);
+       mutex_unlock(&pnp_lock);
        pnp_disable_dev(pnp_dev);
 }