diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 15:08:10 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2013-04-22 10:16:40 +0100 |
| commit | f9ec14f993e133ddaf5e760d6ddf70408435ebcd (patch) | |
| tree | ef71bba09cfaa27b401d394e5c84720c895b67c3 | |
| parent | 2bd2c5b3a5e3dc2d908499013531acd7aa60cf6e (diff) | |
mtd: Disable mtdchar mmap on MMU systems
commit f5cf8f07423b2677cebebcebc863af77223a4972 upstream.
This code was broken because it assumed that all MTD devices were map-based.
Disable it for now, until it can be fixed properly for the next merge window.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
[ luis: adjust context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/mtd/mtdchar.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index f2f482bec573..2cfb1a858c50 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -1136,7 +1136,11 @@ static int mtdchar_mmap(struct file *file, struct vm_area_struct *vma) unsigned long off; u32 len; - if (mtd->type == MTD_RAM || mtd->type == MTD_ROM) { + /* This is broken because it assumes the MTD device is map-based + and that mtd->priv is a valid struct map_info. It should be + replaced with something that uses the mtd_get_unmapped_area() + operation properly. */ + if (0 /*mtd->type == MTD_RAM || mtd->type == MTD_ROM*/) { off = vma->vm_pgoff << PAGE_SHIFT; start = map->phys; len = PAGE_ALIGN((start & ~PAGE_MASK) + map->size); |