summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2012-10-09 15:08:10 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-10-09 15:08:42 +0100
commitf5cf8f07423b2677cebebcebc863af77223a4972 (patch)
treed29db1e640937a02a827a01628f88b03f20f9239 /drivers/mtd
parentffe315012510165ce82e4dd4767f0a5dba9edbf7 (diff)
downloadop-kernel-dev-f5cf8f07423b2677cebebcebc863af77223a4972.zip
op-kernel-dev-f5cf8f07423b2677cebebcebc863af77223a4972.tar.gz
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')
-rw-r--r--drivers/mtd/mtdchar.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 73ae81a..82c0616 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);
OpenPOWER on IntegriCloud