This is a note to let you know that I've just added the patch titled
spi-topcliff-pch: add recovery processing in case wait-event timeout
to the 3.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
spi-topcliff-pch-add-recovery-processing-in-case-wait-event-timeout.patch
and it can be found in the queue-3.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 0f57e168aa109775430c76cc663fb64909813d84 Mon Sep 17 00:00:00 2001
From: Tomoya MORINAGA <[email protected]>
Date: Fri, 9 Dec 2011 13:13:29 +0900
Subject: spi-topcliff-pch: add recovery processing in case wait-event timeout
From: Tomoya MORINAGA <[email protected]>
commit 0f57e168aa109775430c76cc663fb64909813d84 upstream.
Currently, pch_spi_start_transfer failure is not anticipated.
This patch adds the processing.
Signed-off-by: Tomoya MORINAGA <[email protected]>
Signed-off-by: Grant Likely <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/spi/spi-topcliff-pch.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1266,8 +1266,16 @@ static void pch_spi_process_messages(str
char *save_rx_buf = data->cur_trans->rx_buf;
for (i = 0; i < cnt; i ++) {
pch_spi_handle_dma(data, &bpw);
- if (!pch_spi_start_transfer(data))
+ if (!pch_spi_start_transfer(data)) {
+ data->transfer_complete = true;
+ data->current_msg->status = -EIO;
+ data->current_msg->complete
+ (data->current_msg->context);
+ data->bcurrent_msg_processing = false;
+ data->current_msg = NULL;
+ data->cur_trans = NULL;
goto out;
+ }
pch_spi_copy_rx_data_for_dma(data, bpw);
}
data->cur_trans->rx_buf = save_rx_buf;
Patches currently in stable-queue which might be from [email protected] are
queue-3.3/spi-topcliff-pch-modify-pci-bus-number-dynamically-to-get-dma-device-info.patch
queue-3.3/spi-topcliff-pch-supports-a-spi-mode-setup-and-bit-order-setup-by-io-control.patch
queue-3.3/spi-topcliff-pch-fix-issue-for-transmitting-over-4kbyte.patch
queue-3.3/spi-topcliff-pch-add-recovery-processing-in-case-wait-event-timeout.patch
queue-3.3/i2c-eg20t-change-timeout-value-50msec-to-1000msec.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
