Commit 011710e2 authored Jul 27, 2015 by Sifan Naeem Committed by Mark Brown Jul 29, 2015

spi: img-spfi: check for timeout error before proceeding



Calling spfi_wait_all_done is not required if the transfer has timed
out before all data is transferred.

spfi_wait_all_done polls for Alldone interrupt which is triggered to
mark the transfer as complete and to indicate it is now safe to issue
a new transfer.

Fixes: 8c2c8c03 ("spi: img-spfi: Control CS lines with GPIO")
Signed-off-by: Sifan Naeem <sifan.naeem@imgtec.com>
Reviewed-by: Andrew Bresticker <abrestic@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org

parent bc0195aa

drivers/spi/spi-img-spfi.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -266,15 +266,15 @@ static int img_spfi_start_pio(struct spi_master *master,
		cpu_relax();
		}

		ret = spfi_wait_all_done(spfi);
		if (ret < 0)
		return ret;

		if (rx_bytes > 0 \|\| tx_bytes > 0) {
		dev_err(spfi->dev, "PIO transfer timed out\n");
		return -ETIMEDOUT;
		}

		ret = spfi_wait_all_done(spfi);
		if (ret < 0)
		return ret;

		return 0;
		}