diff options
author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
commit | bb39b8d99aae1f7eb13a97bd874838da91080de6 (patch) | |
tree | 3046f53937c0bc5dc13e2b2ab7b688a1932199bf /target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch | |
parent | c6c0d09f85c211560a1405441925681cfa25e8b1 (diff) | |
download | upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.gz upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.bz2 upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.zip |
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y
rebased against linux-3.10.y stable (3.10.32). This should hopefully
make it easier for us in the future to leverage the raspberry/rpi-*
branches.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39770
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch b/target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch new file mode 100644 index 0000000000..855f1fe30c --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch @@ -0,0 +1,40 @@ +From b68b4448dc37e5fd510f1bb9bbd62722ad497f41 Mon Sep 17 00:00:00 2001 +From: Daniel Santos <daniel.santos@pobox.com> +Date: Sun, 5 Jan 2014 17:39:26 -0600 +Subject: [PATCH 168/174] spidev: fix hang when transfer_one_message fails + +commit e120cc0dcf2880a4c5c0a6cb27b655600a1cfa1d upstream. + +This corrects a problem in spi_pump_messages() that leads to an spi +message hanging forever when a call to transfer_one_message() fails. +This failure occurs in my MCP2210 driver when the cs_change bit is set +on the last transfer in a message, an operation which the hardware does +not support. + +Rationale +Since the transfer_one_message() returns an int, we must presume that it +may fail. If transfer_one_message() should never fail, it should return +void. Thus, calls to transfer_one_message() should properly manage a +failure. + +Fixes: ffbbdd21329f3 (spi: create a message queueing infrastructure) +Signed-off-by: Daniel Santos <daniel.santos@pobox.com> +Signed-off-by: Mark Brown <broonie@linaro.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/spi/spi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/spi/spi.c ++++ b/drivers/spi/spi.c +@@ -584,7 +584,9 @@ static void spi_pump_messages(struct kth + ret = master->transfer_one_message(master, master->cur_msg); + if (ret) { + dev_err(&master->dev, +- "failed to transfer one message from queue\n"); ++ "failed to transfer one message from queue: %d\n", ret); ++ master->cur_msg->status = ret; ++ spi_finalize_current_message(master); + return; + } + } |