diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 16:08:10 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 16:08:42 +0200 |
| commit | f5cf8f07423b2677cebebcebc863af77223a4972 (patch) | |
| tree | d29db1e640937a02a827a01628f88b03f20f9239 /drivers/mtd/mtdchar.c | |
| parent | Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowel... (diff) | |
| download | linux-f5cf8f07423b2677cebebcebc863af77223a4972.tar.xz linux-f5cf8f07423b2677cebebcebc863af77223a4972.zip | |
mtd: Disable mtdchar mmap on MMU systems
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>
Diffstat (limited to 'drivers/mtd/mtdchar.c')
| -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 73ae81a629f2..82c06165d3d2 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -1162,7 +1162,11 @@ static int mtdchar_mmap(struct file *file, struct vm_area_struct *vma) resource_size_t start, off; unsigned long len, vma_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 = get_vm_offset(vma); start = map->phys; len = PAGE_ALIGN((start & ~PAGE_MASK) + map->size); |