GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 14:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'spi/topic/core' into spi-next

Browse source
This commit is contained in:
Mark Brown 2014-10-03 16:33:37 +01:00
commit ad71f40a83
1 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
drivers/spi/spi.c
View file

@ -552,6 +552,9 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n)
struct boardinfo *bi; struct boardinfo *bi;
int i; int i;
if (!n)
return -EINVAL;
bi = kzalloc(n * sizeof(*bi), GFP_KERNEL); bi = kzalloc(n * sizeof(*bi), GFP_KERNEL);
if (!bi) if (!bi)
return -ENOMEM; return -ENOMEM;
@ -789,27 +792,35 @@ static int spi_transfer_one_message(struct spi_master *master,
list_for_each_entry(xfer, &msg->transfers, transfer_list) { list_for_each_entry(xfer, &msg->transfers, transfer_list) {
trace_spi_transfer_start(msg, xfer); trace_spi_transfer_start(msg, xfer);
reinit_completion(&master->xfer_completion); if (xfer->tx_buf || xfer->rx_buf) {
reinit_completion(&master->xfer_completion);
ret = master->transfer_one(master, msg->spi, xfer); ret = master->transfer_one(master, msg->spi, xfer);
if (ret < 0) { if (ret < 0) {
dev_err(&msg->spi->dev, dev_err(&msg->spi->dev,
"SPI transfer failed: %d\n", ret); "SPI transfer failed: %d\n", ret);
goto out; goto out;
} }
if (ret > 0) { if (ret > 0) {
ret = 0; ret = 0;
ms = xfer->len * 8 * 1000 / xfer->speed_hz; ms = xfer->len * 8 * 1000 / xfer->speed_hz;
ms += ms + 100; /* some tolerance */ ms += ms + 100; /* some tolerance */
ms = wait_for_completion_timeout(&master->xfer_completion, ms = wait_for_completion_timeout(&master->xfer_completion,
msecs_to_jiffies(ms)); msecs_to_jiffies(ms));
} }
if (ms == 0) { if (ms == 0) {
dev_err(&msg->spi->dev, "SPI transfer timed out\n"); dev_err(&msg->spi->dev,
msg->status = -ETIMEDOUT; "SPI transfer timed out\n");
msg->status = -ETIMEDOUT;
}
} else {
if (xfer->len)
dev_err(&msg->spi->dev,
"Bufferless transfer has length %u\n",
xfer->len);
} }
trace_spi_transfer_stop(msg, xfer); trace_spi_transfer_stop(msg, xfer);