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

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 939edf473235..be13a35c6fec 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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;
                         }
                 }