diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2009-03-25 06:30:15 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 22:54:26 +0200 |
commit | f74d0f5cacb7023422098dd5c98e3ce06787ba56 (patch) | |
tree | 00a035b35209c643dc827970b7798b36d941f0c0 | |
parent | e1000/e1000e/igb/ixgb: do not use netif_wake_queue un-necessarily (diff) | |
download | linux-f74d0f5cacb7023422098dd5c98e3ce06787ba56.tar.xz linux-f74d0f5cacb7023422098dd5c98e3ce06787ba56.zip |
p54spi: mask value read from SPI_ADRS_DMA_WRITE_CTRL in p54spi_wait_bit
Mask value read from SPI_ADRS_DMA_WRITE_CTRL in p54spi_wait_bit.
Without this, 'fw_upload not allowed to DMA write' is observed at both N800 and N810.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/p54/p54spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index d1fe577de3d4..55402729d21b 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c @@ -171,7 +171,7 @@ static int p54spi_wait_bit(struct p54s_priv *priv, u16 reg, __le32 bits) for (i = 0; i < 2000; i++) { p54spi_spi_read(priv, reg, &buffer, sizeof(buffer)); - if (buffer == bits) + if ((buffer & bits) == bits) return 1; msleep(1); |