diff options
| author | Clyde McPherson <ccmcphe@verizon.net> | 2009-06-30 22:39:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-08 15:24:25 -0400 |
| commit | 2fbddeb5c409c90be4706ea2beb7f1fc02100c72 (patch) | |
| tree | fba691617a3beaceaeb133600e7d4f650a7656e2 /drivers/ssb/pcmcia.c | |
| parent | cff782cd94df7adea84af6aa9516c8088f7ea950 (diff) | |
| download | talos-obmc-linux-2fbddeb5c409c90be4706ea2beb7f1fc02100c72.tar.gz talos-obmc-linux-2fbddeb5c409c90be4706ea2beb7f1fc02100c72.zip | |
ssb: Add support for 4318E
Added support for the Broadcom 4318E chipset on PCMCIA/CF cards. The
4318E can do 802.11A/B/G, only B and G mode are supported in b43.
Signed-off-by: Clyde McPherson <ccmcphe@verizon.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/pcmcia.c')
| -rw-r--r-- | drivers/ssb/pcmcia.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c index fbfadbac67e8..d288608d2206 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c @@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus, sprom->board_rev = tuple.TupleData[1]; break; case SSB_PCMCIA_CIS_PA: - GOTO_ERROR_ON(tuple.TupleDataLen != 9, + GOTO_ERROR_ON((tuple.TupleDataLen != 9) && + (tuple.TupleDataLen != 10), "pa tpl size"); sprom->pa0b0 = tuple.TupleData[1] | ((u16)tuple.TupleData[2] << 8); @@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus, sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1]; break; case SSB_PCMCIA_CIS_BFLAGS: - GOTO_ERROR_ON(tuple.TupleDataLen != 3, + GOTO_ERROR_ON((tuple.TupleDataLen != 3) && + (tuple.TupleDataLen != 5), "bfl tpl size"); sprom->boardflags_lo = tuple.TupleData[1] | ((u16)tuple.TupleData[2] << 8); |
