ath0 no longer attaches, cardbus problems?

Hello,

I have an older Dell 4150 laptop that takes forever to build
world, so I don't update it that often.  The last time I
updated it was March 1, 2010.  I just updated the system
yesterday and ath0 (a Linksys PCCard) no longer attaches.

The interesting thing is that ath0 is detected at different
addresses between the working kernel and the non-working
kernel:

   March 1, 2010 kernel
   --------------------
   ath0: <Atheros 5212> mem 0x88000000-0x8800ffff irq 11
       at device 0.0 on  cardbus0
   ath0: [ITHREAD]
   ath0: AR5212 mac 5.9 RF5112 phy 4.3


   Aug 23, 2011 kernel
   -------------------
   ath0: <Atheros 5212> mem 0xf8f10000-0xf8f1ffff irq 11
       at device 0.0 on  cardbus0


I've tried forcing successful returns from
ar5212SetPowerModeAwake() and ar5212SetResetReg()
but it doesn't help (diffs below).

Any suggestions on how to get this to work?
Full dmesg from working and non-working kernels at

   http://people.freebsd.org/~deischen/ath/ath.dmesg

-- 
DE


[deischen_at_orion /usr/src/sys/dev/ath]$ svn diff
Index: ath_hal/ar5212/ar5212_reset.c
===================================================================
--- ath_hal/ar5212/ar5212_reset.c       (revision 225101)
+++ ath_hal/ar5212/ar5212_reset.c       (working copy)
_at__at_ -1145,7 +1145,8 _at__at_

         /* track PHY power state so we don't try to r/w BB registers */
         AH5212(ah)->ah_phyPowerOn = ((resetMask & AR_RC_BB) == 0);
-       return rt;
+//     return rt;
+       return AH_TRUE;
  }

  int16_t
Index: ath_hal/ar5212/ar5212_power.c
===================================================================
--- ath_hal/ar5212/ar5212_power.c       (revision 225101)
+++ ath_hal/ar5212/ar5212_power.c       (working copy)
_at__at_ -77,7 +77,9 _at__at_
                         ath_hal_printf(ah, "%s: Failed to wakeup in  %ums\n",
                                 __func__, POWER_UP_TIME/50);
  #endif
+#if 0
                         return AH_FALSE;
+#endif
                 }
         }

-- 
DE