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

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 90b5b2efafbf45c2435af2771c4842a37786eee7..b4a8bb7759b2cdc7cf2a4e9688cda03523f431a9 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1015,7 +1015,7 @@ static int spi_transfer_one_message(struct spi_master *master,
                                ret = 0;
                                ms = 8LL * 1000LL * xfer->len;
                                do_div(ms, xfer->speed_hz);
-                               ms += ms + 100; /* some tolerance */
+                               ms += ms + 200; /* some tolerance */
 
                                if (ms > UINT_MAX)
                                        ms = UINT_MAX;

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 75c6bd0ac605b2024509985214cdc3d451c6ab53..3b0070695375916c4ebaa67f59cf4284e95e18e6 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -891,7 +891,7 @@ static inline struct spi_message *spi_message_alloc(unsigned ntrans, gfp_t flags
                unsigned i;
                struct spi_transfer *t = (struct spi_transfer *)(m + 1);
 
-               INIT_LIST_HEAD(&m->transfers);
+               spi_message_init_no_memset(m);
                for (i = 0; i < ntrans; i++, t++)
                        spi_message_add_tail(t, m);
        }