brcm47xx: fix memory leak, backport from the mainline kernel

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 400-arch-bcm47xx.patch

diff --git a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
index 14b4088..46d47e3 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-3.0/400-arch-bcm47xx.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c

-@@ -93,3 +93,30 @@ int nvram_getenv(char *name, char *val,
+@@ -199,3 +199,30 @@ int nvram_getenv(char *name, char *val,

        return NVRAM_ERR_ENVNOTFOUND;
  }
  EXPORT_SYMBOL(nvram_getenv);
        return NVRAM_ERR_ENVNOTFOUND;
  }
  EXPORT_SYMBOL(nvram_getenv);


@@ -33,10 +33,10 @@
 +EXPORT_SYMBOL(nvram_get);
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
 +EXPORT_SYMBOL(nvram_get);
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c

-@@ -312,3 +312,20 @@ void __init plat_mem_setup(void)
-       _machine_halt = bcm47xx_machine_halt;
-       pm_power_off = bcm47xx_machine_halt;
+@@ -468,3 +468,20 @@ static int __init bcm47xx_register_flash
+       return -1;

  }
  }

+ fs_initcall(bcm47xx_register_flash);

 +
 +static int __init bcm47xx_register_gpiodev(void)
 +{
 +
 +static int __init bcm47xx_register_gpiodev(void)
 +{