Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
Pull minor spi MXS fixes from Mark Brown:
"These fixes are both pretty minor ones and are driver local."
* tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
spi: mxs: Terminate DMA in case of DMA timeout
spi: mxs: Assign message status after transfer finished
+2
-1
+2
-1
drivers/spi/spi-mxs.c
+2
-1
drivers/spi/spi-mxs.c
···
323
323
if (!ret) {
324
324
dev_err(ssp->dev, "DMA transfer timeout\n");
325
325
ret = -ETIMEDOUT;
326
+
dmaengine_terminate_all(ssp->dmach);
326
327
goto err_vmalloc;
327
328
}
328
329
···
481
480
first = last = 0;
482
481
}
483
482
484
-
m->status = 0;
483
+
m->status = status;
485
484
spi_finalize_current_message(master);
486
485
487
486
return status;