Re: Machine check in bcm43xx_phy_initg

[Michael Buesch <mb@bu3sch.de>]

On Friday 05 May 2006 19:19, David Woodhouse wrote:
> On Fri, 2006-05-05 at 12:59 -0400, Joseph Jezak wrote:
> > I fixed the specs, it should be bcm->chip_package == 2, sorry for the
> > mistake.
> 
> Thanks. The correct patch should look like this then...
> 
> [BCM43xx] Fix access to non-existent PHY registers
> 
> Fix the conditions under which we poke at the APHY registers in
> bcm43xx_phy_initg() to avoid a machine check on chips where they don't
> exist.
> 
> Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Michael Buesch <mb@bu3sch.de>

John, please apply. I will also send a patch for d80211.

> --- linux-2.6.16.ppc64/drivers/net/wireless/bcm43xx/bcm43xx_phy.c~	2006-05-04 19:16:09.000000000 +0100
> +++ linux-2.6.16.ppc64/drivers/net/wireless/bcm43xx/bcm43xx_phy.c	2006-05-05 17:22:57.000000000 +0100
> @@ -1287,7 +1287,7 @@ static void bcm43xx_phy_initg(struct bcm
>  	if (radio->revision == 8)
>  		bcm43xx_phy_write(bcm, 0x0805, 0x3230);
>  	bcm43xx_phy_init_pctl(bcm);
> -	if (bcm->chip_id == 0x4306 && bcm->chip_package != 2) {
> +	if (bcm->chip_id == 0x4306 && bcm->chip_package == 2) {
>  		bcm43xx_phy_write(bcm, 0x0429,
>  				  bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF);
>  		bcm43xx_phy_write(bcm, 0x04C3,
> 

-- 
Greetings Michael.