|
@@ -1190,6 +1190,7 @@ EXPORT_SYMBOL_GPL(spi_setup);
|
|
|
static int __spi_async(struct spi_device *spi, struct spi_message *message)
|
|
|
{
|
|
|
struct spi_master *master = spi->master;
|
|
|
+ struct spi_transfer *xfer;
|
|
|
|
|
|
/* Half-duplex links include original MicroWire, and ones with
|
|
|
* only one data pin like SPI_3WIRE (switches direction) or where
|
|
@@ -1198,7 +1199,6 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message)
|
|
|
*/
|
|
|
if ((master->flags & SPI_MASTER_HALF_DUPLEX)
|
|
|
|| (spi->mode & SPI_3WIRE)) {
|
|
|
- struct spi_transfer *xfer;
|
|
|
unsigned flags = master->flags;
|
|
|
|
|
|
list_for_each_entry(xfer, &message->transfers, transfer_list) {
|
|
@@ -1211,6 +1211,15 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * Set transfer bits_per_word as spi device default if it is not
|
|
|
+ * set for this transfer.
|
|
|
+ */
|
|
|
+ list_for_each_entry(xfer, &message->transfers, transfer_list) {
|
|
|
+ if (!xfer->bits_per_word)
|
|
|
+ xfer->bits_per_word = spi->bits_per_word;
|
|
|
+ }
|
|
|
+
|
|
|
message->spi = spi;
|
|
|
message->status = -EINPROGRESS;
|
|
|
return master->transfer(spi, message);
|