Clyde McPherson wrote:
> 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.
> 
> diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
> index fbfadba..d288608 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);

These two patches do not have the correct form, and they have mangled
white space. That is why I reformatted and resubmitted them.

Larry
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev

Reply via email to