X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fpatches%2F065-block2mtd_init.patch;h=bdb19eeccba9e18fee7f629d4744f5b1ec61cbee;hb=541ff27cfb26939cf1b98b73fa5aeea0d8432082;hp=ef483bedd1a1a54c9262298bafc4448fc1ec243b;hpb=1ebe6d34880d1e26b37fe4f794b5039a8245e750;p=openwrt-10.03%2F.git

diff --git a/target/linux/generic-2.6/patches/065-block2mtd_init.patch b/target/linux/generic-2.6/patches/065-block2mtd_init.patch
index ef483bedd..bdb19eecc 100644
--- a/target/linux/generic-2.6/patches/065-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches/065-block2mtd_init.patch
@@ -1,5 +1,6 @@
---- linux.old/drivers/mtd/devices/block2mtd.c	2007-03-02 01:00:13.866987272 +0100
-+++ linux.dev/drivers/mtd/devices/block2mtd.c	2007-03-02 02:03:45.558522080 +0100
+diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c
+--- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c	2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c	2007-05-26 20:06:13.547923960 +0200
 @@ -16,6 +16,7 @@
  #include <linux/list.h>
  #include <linux/init.h>
@@ -8,7 +9,7 @@
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>
-@@ -287,10 +288,11 @@
+@@ -288,10 +289,11 @@
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -31,7 +32,7 @@
 +	if (!mtdname)
 +		mtdname = devname;
 +
-+	dev->mtd.name = kmalloc(strlen(mtdname), GFP_KERNEL);
++	dev->mtd.name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
 +
  	if (!dev->mtd.name)
  		goto devinit_err;