diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-11 23:09:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-11 23:09:00 +0100 |
| commit | e897f795a925c95082b6890c6c6a00286b702012 (patch) | |
| tree | 60a9c4c6cb1af975e648d292b38370d29ee233eb /drivers/spi/spi.c | |
| parent | 31d25e5cdad8e627a6509261da8b1eb083d66107 (diff) | |
| parent | 22de3ef94bd191537227a7f1bb0908f368601f03 (diff) | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
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 57a195041dc7..5223bd0ed360 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -16,7 +16,6 @@ */ #include <linux/kernel.h> -#include <linux/kmod.h> #include <linux/device.h> #include <linux/init.h> #include <linux/cache.h> @@ -1360,7 +1359,6 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc) spi->dev.of_node = nc; /* Register the new device */ - request_module("%s%s", SPI_MODULE_PREFIX, spi->modalias); rc = spi_add_device(spi); if (rc) { dev_err(&master->dev, "spi_device register error %s\n", @@ -1894,6 +1892,8 @@ 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); |