From: Mark Brown <broonie@kernel.org>
Date: Sat, 11 Apr 2015 22:09:09 +0000 (+0100)
Subject: Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=431959c0793e0d399303a061424dbaa1b33eb940;p=deliverable%2Flinux.git

Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic/dw' and 'spi/topic/err' into spi-next
---

431959c0793e0d399303a061424dbaa1b33eb940
diff --cc drivers/spi/spi.c
index 865786012579,c64a3e59fce3,c64a3e59fce3,31d4d9d997e2,771325322995..900a91bdb3a8
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@@ -850,9 -851,6 -851,6 -851,9 -851,9 +850,9 @@@@@@ out
     	if (msg->status == -EINPROGRESS)
     		msg->status = ret;
     
-  - 	if (msg->status)
++++ 	if (msg->status && master->handle_err)
 ++  		master->handle_err(master, msg);
 ++  
     	spi_finalize_current_message(master);
     
     	return ret;
diff --cc include/linux/spi/spi.h
index 71e9d880f86e,ed9489d893a4,ed9489d893a4,4eaac3a5227b,5685af84a64d..478c46845460
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@@@@ -294,8 -294,6 -294,6 -294,8 -294,8 +294,8 @@@@@@ static inline void spi_unregister_drive
      *                    transfer_one_message are mutually exclusive; when both
      *                    are set, the generic subsystem does not call your
      *                    transfer_one callback.
-  -  * @handle_err: the subsystem calls the driver to handle and error that occurs
++++  * @handle_err: the subsystem calls the driver to handle an error that occurs
 ++   *		in the generic implementation of transfer_one_message().
      * @unprepare_message: undo any work done by prepare_message().
      * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
      *	number. Any individual value may be -ENOENT for CS lines that