diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:01:58 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:01:58 +0000 |
| commit | 26cc44f8a366a7fbebed3b98f499c2774bfcda44 (patch) | |
| tree | 6e40aad496af7f590c4390666dff8ed0d7f52634 /drivers/spi/spi.c | |
| parent | 6a13feb9c82803e2b815eca72fa7a9f5561d7861 (diff) | |
| parent | abeedb0159eec42c52a28fc44457164f71aa12a9 (diff) | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index a5f53de813d3..bf989f6a80e0 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1992,11 +1992,11 @@ int spi_setup(struct spi_device *spi) if (!spi->max_speed_hz) spi->max_speed_hz = spi->master->max_speed_hz; - spi_set_cs(spi, false); - if (spi->master->setup) status = spi->master->setup(spi); + spi_set_cs(spi, false); + dev_dbg(&spi->dev, "setup mode %d, %s%s%s%s%u bits/w, %u Hz max --> %d\n", (int) (spi->mode & (SPI_CPOL | SPI_CPHA)), (spi->mode & SPI_CS_HIGH) ? "cs_high, " : "", |