brcm47xx: fix memory leak, backport from the mainline kernel

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 900-bcm47xx_wdt-noprescale.patch

diff --git a/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch b/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch
index d259dcf..d60247e 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch
+++ b/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch
@@ -18,7 +18,7 @@
 +static inline void bcm47xx_wdt_hw_start(u32 ticks)
  {
 -      /* this is 2,5s on 100Mhz clock  and 2s on 133 Mhz */
 +static inline void bcm47xx_wdt_hw_start(u32 ticks)
  {
 -      /* this is 2,5s on 100Mhz clock  and 2s on 133 Mhz */

-       switch (bcm47xx_active_bus_type) {
+       switch (bcm47xx_bus_type) {

  #ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
 -              ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);
  #ifdef CONFIG_BCM47XX_SSB
        case BCM47XX_BUS_TYPE_SSB:
 -              ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);


@@ -87,7 +87,7 @@
 -      setup_timer(&wdt_timer, bcm47xx_timer_tick, 0L);
 +      /* FIXME Other cores */
 +#ifdef BCM47XX_BUS_TYPE_BCMA
 -      setup_timer(&wdt_timer, bcm47xx_timer_tick, 0L);
 +      /* FIXME Other cores */
 +#ifdef BCM47XX_BUS_TYPE_BCMA

-+      if(bcm47xx_active_bus_type == BCM47XX_BUS_TYPE_BCMA &&
++      if(bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA &&

 +         bcm47xx_bus.ssb.chip_id == 0x5354) {
 +              /* Slow WDT clock, no pre-scaling */
 +              needs_sw_scale = 0;
 +         bcm47xx_bus.ssb.chip_id == 0x5354) {
 +              /* Slow WDT clock, no pre-scaling */
 +              needs_sw_scale = 0;