summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-08-26 13:20:06 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2011-08-26 13:22:42 +0200
commit4234541f1a64d9dc6d489cf8f614dc01c62360f6 (patch)
tree2b7f13dbcb1dca54ed29e91440144e8f54254951
parent6c32df437c7c5b1fc29d3ca29b0ff44f8dfafc56 (diff)
downloadlinux-4234541f1a64d9dc6d489cf8f614dc01c62360f6.tar.gz
linux-4234541f1a64d9dc6d489cf8f614dc01c62360f6.tar.bz2
linux-4234541f1a64d9dc6d489cf8f614dc01c62360f6.zip
omap: iommu: Fix up mutex->spin_lock conversion of iommu_lock
The omap_iommu_set_isr() was still using the mutex functions but the iommu_lock was converted to a spin_lock. Fix that up. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r--drivers/iommu/omap-iommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index dad45ab8cce3..90744afbed71 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -918,14 +918,14 @@ int omap_iommu_set_isr(const char *name,
return -ENODEV;
obj = to_iommu(dev);
- mutex_lock(&obj->iommu_lock);
+ spin_lock(&obj->iommu_lock);
if (obj->refcount != 0) {
- mutex_unlock(&obj->iommu_lock);
+ spin_unlock(&obj->iommu_lock);
return -EBUSY;
}
obj->isr = isr;
obj->isr_priv = isr_priv;
- mutex_unlock(&obj->iommu_lock);
+ spin_unlock(&obj->iommu_lock);
return 0;
}