Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247551
b: refs/heads/master
c: fc2b1e0
h: refs/heads/master
i:
  247549: 85236b2
  247547: fd108a7
  247543: 396bf39
  247535: 57ed5a2
  247519: bb633c9
  247487: a9e66ff
  247423: 823a5db
  247295: ddc2250
v: v3
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed May 5, 2011
1 parent fc967d1 commit 9215190
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf3a03b9c99a0b2715741d116f50f513f545bb2d
refs/heads/master: fc2b1e0cfe9b4cabde8afeacc2bb81a95bf83afb
28 changes: 1 addition & 27 deletions trunk/drivers/net/wireless/b43/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4212,33 +4212,7 @@ static void b43_bluetooth_coext_disable(struct b43_wldev *dev)

static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
{
#ifdef CONFIG_SSB_DRIVER_PCICORE
struct ssb_bus *bus = dev->dev->bus;
u32 tmp;

if (bus->pcicore.dev &&
bus->pcicore.dev->id.coreid == SSB_DEV_PCI &&
bus->pcicore.dev->id.revision <= 5) {
/* IMCFGLO timeouts workaround. */
tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
switch (bus->bustype) {
case SSB_BUSTYPE_PCI:
case SSB_BUSTYPE_PCMCIA:
tmp &= ~SSB_IMCFGLO_REQTO;
tmp &= ~SSB_IMCFGLO_SERTO;
tmp |= 0x32;
break;
case SSB_BUSTYPE_SSB:
tmp &= ~SSB_IMCFGLO_REQTO;
tmp &= ~SSB_IMCFGLO_SERTO;
tmp |= 0x53;
break;
default:
break;
}
ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
}
#endif /* CONFIG_SSB_DRIVER_PCICORE */
/* TODO: implement 80211 core workaround here */
}

static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)
Expand Down

0 comments on commit 9215190

Please sign in to comment.