From c59937beb04b6494d476b4abfa0598f93da0ec87 Mon Sep 17 00:00:00 2001 From: Ohad Ben-Cohen Date: Wed, 22 Feb 2012 11:14:46 +0200 Subject: [PATCH] --- yaml --- r: 288035 b: refs/heads/master c: 87997aaa1bad1fc37e4ff7eb27850172017017a0 h: refs/heads/master i: 288033: a0a3ab28c27f09d5ccb60caaf32da3262c129f25 288031: 943a79090faa46012679da13cfc7cb33460a8ffc v: v3 --- [refs] | 2 +- trunk/drivers/iommu/omap-iommu-debug.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 44075e7f9182..8e5cab876d67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46451d6229723ce1428c69e5b4f3308a775473fd +refs/heads/master: 87997aaa1bad1fc37e4ff7eb27850172017017a0 diff --git a/trunk/drivers/iommu/omap-iommu-debug.c b/trunk/drivers/iommu/omap-iommu-debug.c index bad9f9da990d..103dbd92e256 100644 --- a/trunk/drivers/iommu/omap-iommu-debug.c +++ b/trunk/drivers/iommu/omap-iommu-debug.c @@ -274,7 +274,7 @@ static ssize_t debug_read_mem(struct file *file, char __user *userbuf, mutex_lock(&iommu_debug_lock); area = omap_find_iovm_area(dev, (u32)ppos); - if (IS_ERR(area)) { + if (!area) { bytes = -EINVAL; goto err_out; } @@ -311,7 +311,7 @@ static ssize_t debug_write_mem(struct file *file, const char __user *userbuf, } area = omap_find_iovm_area(dev, (u32)ppos); - if (IS_ERR(area)) { + if (!area) { count = -EINVAL; goto err_out; }