diff options
author | Mike McCormack <mikem@ring3k.org> | 2009-09-01 03:54:27 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 17:40:44 -0700 |
commit | 72c60683282a6cd047db47d605eb96e2a6fac72c (patch) | |
tree | 8cf9906142221f6ef80225d7cc29c7f045dcdb48 /drivers/net/sky2.c | |
parent | 90bbebb4a8258a398705ecaa2e6b9e177928ee7a (diff) | |
download | kernel-crypto-72c60683282a6cd047db47d605eb96e2a6fac72c.tar.gz kernel-crypto-72c60683282a6cd047db47d605eb96e2a6fac72c.tar.xz kernel-crypto-72c60683282a6cd047db47d605eb96e2a6fac72c.zip |
sky2: Use 32bit read to read Y2_VAUX_AVAIL
B0_CTST is a 24bit register according to the vendor driver (sk98lin).
A 16bit read on B0_CTST will always return 0 for Y2_VAUX_AVAIL (1<<16),
so use a 32bit read when testing Y2_VAUX_AVAIL
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 7108b1292b9..d1f3b46a2b0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -273,7 +273,7 @@ static void sky2_power_aux(struct sky2_hw *hw) Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS); /* switch power to VAUX */ - if (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL) + if (sky2_read32(hw, B0_CTST) & Y2_VAUX_AVAIL) sky2_write8(hw, B0_POWER_CTRL, (PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_ON | PC_VCC_OFF)); |