diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-08-26 07:20:06 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-08-26 07:22:42 -0400 |
| commit | 4234541f1a64d9dc6d489cf8f614dc01c62360f6 (patch) | |
| tree | 2b7f13dbcb1dca54ed29e91440144e8f54254951 | |
| parent | 6c32df437c7c5b1fc29d3ca29b0ff44f8dfafc56 (diff) | |
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.c | 6 |
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, | |||
| 918 | return -ENODEV; | 918 | return -ENODEV; |
| 919 | 919 | ||
| 920 | obj = to_iommu(dev); | 920 | obj = to_iommu(dev); |
| 921 | mutex_lock(&obj->iommu_lock); | 921 | spin_lock(&obj->iommu_lock); |
| 922 | if (obj->refcount != 0) { | 922 | if (obj->refcount != 0) { |
| 923 | mutex_unlock(&obj->iommu_lock); | 923 | spin_unlock(&obj->iommu_lock); |
| 924 | return -EBUSY; | 924 | return -EBUSY; |
| 925 | } | 925 | } |
| 926 | obj->isr = isr; | 926 | obj->isr = isr; |
| 927 | obj->isr_priv = isr_priv; | 927 | obj->isr_priv = isr_priv; |
| 928 | mutex_unlock(&obj->iommu_lock); | 928 | spin_unlock(&obj->iommu_lock); |
| 929 | 929 | ||
| 930 | return 0; | 930 | return 0; |
| 931 | } | 931 | } |
