p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2014-06-02 17:08:34 +01:00
parent 03689d2d75 80874d8c9e
commit 15751f2e71
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/spi/spi.c
View File

@ -796,7 +796,7 @@ static int spi_transfer_one_message(struct spi_master *master,
if (ret > 0) {
ret = 0;
ms = xfer->len * 8 * 1000 / xfer->speed_hz;
ms += 10; /* some tolerance */
ms += ms + 100; /* some tolerance */
ms = wait_for_completion_timeout(&master->xfer_completion,
msecs_to_jiffies(ms));
@ -1268,11 +1268,10 @@ static void of_register_spi_devices(struct spi_master *master)
spi->mode |= SPI_TX_QUAD;
break;
default:
dev_err(&master->dev,
"spi-tx-bus-width %d not supported\n",
value);
spi_dev_put(spi);
continue;
dev_warn(&master->dev,
"spi-tx-bus-width %d not supported\n",
value);
break;
}
}
@ -1287,11 +1286,10 @@ static void of_register_spi_devices(struct spi_master *master)
spi->mode |= SPI_RX_QUAD;
break;
default:
dev_err(&master->dev,
"spi-rx-bus-width %d not supported\n",
value);
spi_dev_put(spi);
continue;
dev_warn(&master->dev,
"spi-rx-bus-width %d not supported\n",
value);
break;
}
}