Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic/bcm2835', 'spi/topic/bcm53xx' and 'spi/topic/bitbang' into spi-next

2015-04-11 23:09:03 +01:00
parent 19655dd083 ea467326e3 b716c4ffc6 704f32d48a b3e7766bc4 232a5adc51
commit f9de73426c
6 changed files with 299 additions and 161 deletions
--- 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;