p54spi: mask value read from SPI_ADRS_DMA_WRITE_CTRL in p54spi_wait_bit
authorMax Filippov <jcmvbkbc@gmail.com>
Wed, 25 Mar 2009 05:30:15 +0000 (08:30 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Apr 2009 20:54:26 +0000 (16:54 -0400)
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>
drivers/net/wireless/p54/p54spi.c

index d1fe577de3d4de3b8694a6f9002452a0e9da0e57..55402729d21bd50170de39331b72daf49cab75c5 100644 (file)
@@ -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);