Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2 files changed, 10 insertions, 9 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 8189adfefaef..47794d23a42e 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1568,9 +1568,12 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         int ret, wbufsize, word_gap, words;
         const struct kvec *vec;
         unsigned long vec_seek;
+        unsigned long initial_adr;
+        int initial_len = len;
 
         wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
         adr += chip->start;
+        initial_adr = adr;
         cmd_adr = adr & ~(wbufsize-1);
 
         /* Let's determine this according to the interleave only once */
@@ -1583,7 +1586,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
                 return ret;
         }
 
-        XIP_INVAL_CACHED_RANGE(map, adr, len);
+        XIP_INVAL_CACHED_RANGE(map, initial_adr, initial_len);
         ENABLE_VPP(map);
         xip_disable(map, chip, cmd_adr);
 
@@ -1674,7 +1677,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         chip->state = FL_WRITING;
 
         ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
-                                   adr, len,
+                                   initial_adr, initial_len,
                                    chip->buffer_write_time);
         if (ret) {
                 map_write(map, CMD(0x70), cmd_adr);
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index b42553cd9af5..5d3ac512ce16 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -27,12 +27,10 @@ static void mtd_notify_add(struct mtd_info* mtd)
         if (!mtd)
                 return;
 
-        class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
-                            NULL, "mtd%d", mtd->index);
+        device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), "mtd%d", mtd->index);
 
-        class_device_create(mtd_class, NULL,
-                            MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
-                            NULL, "mtd%dro", mtd->index);
+        device_create(mtd_class, NULL,
+                      MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), "mtd%dro", mtd->index);
 }
 
 static void mtd_notify_remove(struct mtd_info* mtd)
@@ -40,8 +38,8 @@ static void mtd_notify_remove(struct mtd_info* mtd)
         if (!mtd)
                 return;
 
-        class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2));
-        class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1));
+        device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2));
+        device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1));
 }
 
 static struct mtd_notifier notifier = {