hostapd: merge some pending fixes (fixes assoc errors when moving between vaps of...
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.3 / 026-bcma_pmu_regression.patch
1 --- a/drivers/bcma/driver_chipcommon_pmu.c
2 +++ b/drivers/bcma/driver_chipcommon_pmu.c
3 @@ -110,7 +110,7 @@ void bcma_pmu_workarounds(struct bcma_dr
4 /* enable 12 mA drive strenth for 4313 and set chipControl
5 register bit 1 */
6 bcma_chipco_chipctl_maskset(cc, 0,
7 - BCMA_CCTRL_4313_12MA_LED_DRIVE,
8 + ~BCMA_CCTRL_4313_12MA_LED_DRIVE,
9 BCMA_CCTRL_4313_12MA_LED_DRIVE);
10 break;
11 case BCMA_CHIP_ID_BCM4331:
12 @@ -124,14 +124,14 @@ void bcma_pmu_workarounds(struct bcma_dr
13 register bit 15 */
14 if (bus->chipinfo.rev == 0) {
15 bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL,
16 - BCMA_CCTRL_43224_GPIO_TOGGLE,
17 + ~BCMA_CCTRL_43224_GPIO_TOGGLE,
18 BCMA_CCTRL_43224_GPIO_TOGGLE);
19 bcma_chipco_chipctl_maskset(cc, 0,
20 - BCMA_CCTRL_43224A0_12MA_LED_DRIVE,
21 + ~BCMA_CCTRL_43224A0_12MA_LED_DRIVE,
22 BCMA_CCTRL_43224A0_12MA_LED_DRIVE);
23 } else {
24 bcma_chipco_chipctl_maskset(cc, 0,
25 - BCMA_CCTRL_43224B0_12MA_LED_DRIVE,
26 + ~BCMA_CCTRL_43224B0_12MA_LED_DRIVE,
27 BCMA_CCTRL_43224B0_12MA_LED_DRIVE);
28 }
29 break;