mtd: mtdchar: return expected errors on mmap() call

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Wed Nov 13 13:59:06 EST 2013


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=b99959323732ed0c81da2488252f64c02ad37fbe
Commit:     b99959323732ed0c81da2488252f64c02ad37fbe
Parent:     80bd33acdaa21fafa8ff4391ccdf879d227111bb
Author:     Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
AuthorDate: Mon Oct 28 18:08:15 2013 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Nov 11 11:18:15 2013 -0800

    mtd: mtdchar: return expected errors on mmap() call
    
    According both to POSIX.1-2008 and Linux Programmer's Manual mmap()
    syscall shouldn't return undocumented ENOSYS, this change replaces
    the errno with more appropriate ENODEV and EACCESS.
    
    Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy at mentor.com>
    Cc: David Woodhouse <David.Woodhouse at intel.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/mtdchar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 9aa0c5e..2147e73 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -1100,7 +1100,7 @@ static unsigned long mtdchar_get_unmapped_area(struct file *file,
 		return (unsigned long) -EINVAL;
 
 	ret = mtd_get_unmapped_area(mtd, len, offset, flags);
-	return ret == -EOPNOTSUPP ? -ENOSYS : ret;
+	return ret == -EOPNOTSUPP ? -ENODEV : ret;
 }
 #endif
 
@@ -1125,9 +1125,9 @@ static int mtdchar_mmap(struct file *file, struct vm_area_struct *vma)
 #endif
 		return vm_iomap_memory(vma, map->phys, map->size);
 	}
-	return -ENOSYS;
+	return -ENODEV;
 #else
-	return vma->vm_flags & VM_SHARED ? 0 : -ENOSYS;
+	return vma->vm_flags & VM_SHARED ? 0 : -EACCES;
 #endif
 }
 



More information about the linux-mtd-cvs mailing list