Merge remote-tracking branch 'spi/topic/core' into spi-next (e897f795) · Commits · e / devices / android_kernel_teracube_2e

drivers/spi/spi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);