diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-06 21:33:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-06 21:33:19 +0100 |
| commit | 3e00803a97d1424e68a649a25b248f58d81d379d (patch) | |
| tree | cccc36a3267cbfdb1e9ffc8f065b89455e6d1e20 /drivers/spi | |
| parent | spi: dw: program registers as soon as possible (diff) | |
| parent | spi: introduce master->handle_err() callback (diff) | |
| download | linux-3e00803a97d1424e68a649a25b248f58d81d379d.tar.xz linux-3e00803a97d1424e68a649a25b248f58d81d379d.zip | |
Merge branch 'topic/err' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index c64a3e59fce3..31d4d9d997e2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -851,6 +851,9 @@ out: if (msg->status == -EINPROGRESS) msg->status = ret; + if (msg->status) + master->handle_err(master, msg); + spi_finalize_current_message(master); return ret; |