diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 15:08:10 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-04-25 20:25:48 +0100 |
| commit | 095a3cac24ab4bc77ca12efd6198ca237282801e (patch) | |
| tree | be02f75e46f2b45c459f5cdae2905fd201b3c8cd | |
| parent | 8b060e4133e4c72dcff12e7e4a0ada07354ef953 (diff) | |
| download | linux-stable-095a3cac24ab4bc77ca12efd6198ca237282801e.tar.gz linux-stable-095a3cac24ab4bc77ca12efd6198ca237282801e.tar.bz2 linux-stable-095a3cac24ab4bc77ca12efd6198ca237282801e.zip | |
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 e7dc732ddabc..1d90e26bfa0f 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -1154,7 +1154,11 @@ static int mtd_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); |