diff options
| author | Hari Kanigeri <h-kanigeri2@ti.com> | 2011-10-25 10:51:12 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 10:51:12 +0800 |
| commit | c33516c67a8f7c8bfdfcdfcb69fab3ba2ed31c4e (patch) | |
| tree | b2d8d47fd1d704262b12077a436e9063fd788118 | |
| parent | 1a59883f98e9bd551ef222ce8e307da019cdb32c (diff) | |
omap: iodmm: fix the unregister mmu fault notification
The unregister mmu fault ioctl was wrongly calling the register_mmu_fault
function instead of unregister_mmu_fault function.
Change-Id: I85acae8eebadff4e75927a4454fce5d61cbe216e
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
| -rw-r--r-- | arch/arm/plat-omap/dmm_user.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/iodmm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dmm_user.c b/arch/arm/plat-omap/dmm_user.c index 6137ebf2235..a8e96f8f57e 100644 --- a/arch/arm/plat-omap/dmm_user.c +++ b/arch/arm/plat-omap/dmm_user.c @@ -80,7 +80,7 @@ static int omap_dmm_ioctl(struct inode *inode, struct file *filp, ret = register_mmufault(obj, (const void __user *)args); break; case IOMMU_IOCEVENTUNREG: - ret = register_mmufault(obj, (const void __user *)args); + ret = unregister_mmufault(obj, (const void __user *)args); break; case DMM_IOCMEMFLUSH: ret = proc_begin_dma(obj, (void __user *)args); diff --git a/arch/arm/plat-omap/iodmm.c b/arch/arm/plat-omap/iodmm.c index 465fb9017ae..25a18812d64 100644 --- a/arch/arm/plat-omap/iodmm.c +++ b/arch/arm/plat-omap/iodmm.c @@ -1104,7 +1104,7 @@ int unregister_mmufault(struct iodmm_struct *obj, const void __user *args) if (copy_from_user(&fd, (void __user *)args, sizeof(int))) return -EFAULT; - /* Free DMM mapped memory resources */ + /* remove the mmu fault event notification */ spin_lock_irq(&obj->iovmm->iommu->event_lock); list_for_each_entry_safe(fd_reg, temp_reg, &obj->iovmm->iommu->event_list, list) { |