Commit 52b8243b authored by Jakub Kicinski's avatar Jakub Kicinski Committed by John W. Linville

rt2800: initialize queues before giving up due to DMA error

Don't immediately abort .start if DMA is busy before we
initialize the queues. Some drivers do not deinitialize
queues properly and we would fail to take over after them.

This behaviour is consistent with legacy driver.
Signed-off-by: default avatarJakub Kicinski <kubakici@wp.pl>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Reviewed-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b7e1d225
...@@ -290,7 +290,7 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev) ...@@ -290,7 +290,7 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev)
msleep(10); msleep(10);
} }
ERROR(rt2x00dev, "WPDMA TX/RX busy, aborting.\n"); ERROR(rt2x00dev, "WPDMA TX/RX busy [0x%08x].\n", reg);
return -EACCES; return -EACCES;
} }
EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready); EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready);
......
...@@ -496,8 +496,10 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev) ...@@ -496,8 +496,10 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
{ {
int retval; int retval;
if (unlikely(rt2800_wait_wpdma_ready(rt2x00dev) || /* Wait for DMA, ignore error until we initialize queues. */
rt2800pci_init_queues(rt2x00dev))) rt2800_wait_wpdma_ready(rt2x00dev);
if (unlikely(rt2800pci_init_queues(rt2x00dev)))
return -EIO; return -EIO;
retval = rt2800_enable_radio(rt2x00dev); retval = rt2800_enable_radio(rt2x00dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment