Merge remote-tracking branch 'spi/topic/bitbang' into spi-next (dd8c26f0) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/spi/spi-bitbang.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ int spi_bitbang_setup(struct spi_device *spi)
		bitbang = spi_master_get_devdata(spi->master);

		if (!cs) {
		cs = kzalloc(sizeof *cs, GFP_KERNEL);
		cs = kzalloc(sizeof(*cs), GFP_KERNEL);
		if (!cs)
		return -ENOMEM;
		spi->controller_state = cs;
		@@ -349,7 +349,8 @@ static int spi_bitbang_transfer_one(struct spi_master *master,
		if (t->delay_usecs)
		udelay(t->delay_usecs);

		if (cs_change && !list_is_last(&t->transfer_list, &m->transfers)) {
		if (cs_change &&
		!list_is_last(&t->transfer_list, &m->transfers)) {
		/* sometimes a short mid-message deselect of the chip
		* may be needed to terminate a mode or command
		*/