Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic...

[people/ms/linux.git] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 5223bd0ed360b3a55e79e6de6cc3a06931f5641d..865786012579d5a4a538b61b2ec32642a4639804 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -850,6 +850,9 @@ out:
        if (msg->status == -EINPROGRESS)
                msg->status = ret;
 
+       if (msg->status)
+               master->handle_err(master, msg);
+
        spi_finalize_current_message(master);
 
        return ret;