projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HID: usbhid: Fix flood of "control queue full" messages
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-rspi.c
diff --git
a/drivers/spi/spi-rspi.c
b/drivers/spi/spi-rspi.c
index
e39fd38
..
d16ed88
100644
(file)
--- a/
drivers/spi/spi-rspi.c
+++ b/
drivers/spi/spi-rspi.c
@@
-618,9
+618,9
@@
static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx,
ret = -ETIMEDOUT;
}
if (tx)
ret = -ETIMEDOUT;
}
if (tx)
- dmaengine_terminate_
all
(rspi->ctlr->dma_tx);
+ dmaengine_terminate_
sync
(rspi->ctlr->dma_tx);
if (rx)
if (rx)
- dmaengine_terminate_
all
(rspi->ctlr->dma_rx);
+ dmaengine_terminate_
sync
(rspi->ctlr->dma_rx);
}
rspi_disable_irq(rspi, irq_mask);
}
rspi_disable_irq(rspi, irq_mask);
@@
-634,7
+634,7
@@
static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx,
no_dma_tx:
if (rx)
no_dma_tx:
if (rx)
- dmaengine_terminate_
all
(rspi->ctlr->dma_rx);
+ dmaengine_terminate_
sync
(rspi->ctlr->dma_rx);
no_dma_rx:
if (ret == -EAGAIN) {
dev_warn_once(&rspi->ctlr->dev,
no_dma_rx:
if (ret == -EAGAIN) {
dev_warn_once(&rspi->ctlr->dev,