diff options
| author | Tomoya MORINAGA <tomoya.rohm@gmail.com> | 2011-12-09 13:13:29 +0900 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-09 20:58:36 -0700 |
| commit | 0f57e168aa109775430c76cc663fb64909813d84 (patch) | |
| tree | beeb8ae94e79bce0fba840bcb1216c9d642c2376 /drivers/spi/spi-topcliff-pch.c | |
| parent | f258b44e22e07f5e98ac2260c70acff5784791b6 (diff) | |
| download | linux-stable-0f57e168aa109775430c76cc663fb64909813d84.tar.gz linux-stable-0f57e168aa109775430c76cc663fb64909813d84.tar.bz2 linux-stable-0f57e168aa109775430c76cc663fb64909813d84.zip | |
spi-topcliff-pch: add recovery processing in case wait-event timeout
Currently, pch_spi_start_transfer failure is not anticipated.
This patch adds the processing.
Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi-topcliff-pch.c')
| -rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 5a477e91426f..c9e1fcc923bc 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1266,8 +1266,16 @@ static void pch_spi_process_messages(struct work_struct *pwork) 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; |