Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd8c26f0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/bitbang' into spi-next

parents 52d85ebb cff93c58

drivers/spi/spi-bitbang.c

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

	bitbang = spi_master_get_devdata(spi->master);





	if (!cs) {

	if (!cs) {

		cs = kzalloc(sizeof *cs, GFP_KERNEL);

		cs = kzalloc(sizeof(*cs), GFP_KERNEL);

		if (!cs)

		if (!cs)

			return -ENOMEM;

			return -ENOMEM;

		spi->controller_state = cs;

		spi->controller_state = cs;
@@ -349,7 +349,8 @@ static int spi_bitbang_transfer_one(struct spi_master *master, 
		if (t->delay_usecs)

		if (t->delay_usecs)

			udelay(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

			/* sometimes a short mid-message deselect of the chip

			 * may be needed to terminate a mode or command

			 * may be needed to terminate a mode or command

			 */

			 */