mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
Merge remote-tracking branch 'spi/topic/core' into spi-next
This commit is contained in:
commit
e897f795a9
1 changed files with 2 additions and 2 deletions
|
@ -16,7 +16,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/kmod.h>
|
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/cache.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;
|
spi->dev.of_node = nc;
|
||||||
|
|
||||||
/* Register the new device */
|
/* Register the new device */
|
||||||
request_module("%s%s", SPI_MODULE_PREFIX, spi->modalias);
|
|
||||||
rc = spi_add_device(spi);
|
rc = spi_add_device(spi);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
dev_err(&master->dev, "spi_device register error %s\n",
|
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)
|
if (!spi->max_speed_hz)
|
||||||
spi->max_speed_hz = spi->master->max_speed_hz;
|
spi->max_speed_hz = spi->master->max_speed_hz;
|
||||||
|
|
||||||
|
spi_set_cs(spi, false);
|
||||||
|
|
||||||
if (spi->master->setup)
|
if (spi->master->setup)
|
||||||
status = spi->master->setup(spi);
|
status = spi->master->setup(spi);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue