diff options
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 | 45 |
1 files changed, 0 insertions, 45 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 deleted file mode 100644 index 655d322e15..0000000000 --- a/target/linux/brcm2708/patches-3.10/0168-spidev-fix-hang-when-transfer_one_message-fails.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d02bc1f83cf08d59c159eb2e1263a3b4a2addc90 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/196] 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(-) - -diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 32b7bb1..ca99ac9 100644 ---- a/drivers/spi/spi.c -+++ b/drivers/spi/spi.c -@@ -584,7 +584,9 @@ static void spi_pump_messages(struct kthread_work *work) - 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; - } - } --- -1.9.1 - |