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

Commit d52df2e2 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

spi_bitbang: always grab lock with irqs blocked 



Fix a glitch reported by lockdep in the spi_bitbang code: it needs to
consistently block IRQs when holding that spinlock.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2b484a2

drivers/spi/spi_bitbang.c

+3 −2
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ int spi_bitbang_setup(struct spi_device *spi) 
	struct spi_bitbang_cs	*cs = spi->controller_state;

	struct spi_bitbang	*bitbang;

	int			retval;

	unsigned long		flags;



	bitbang = spi_master_get_devdata(spi->master);
@@ -222,12 +223,12 @@ int spi_bitbang_setup(struct spi_device *spi) 
	 */



	/* deselect chip (low or high) */

	spin_lock(&bitbang->lock);

	spin_lock_irqsave(&bitbang->lock, flags);

	if (!bitbang->busy) {

		bitbang->chipselect(spi, BITBANG_CS_INACTIVE);

		ndelay(cs->nsecs);

	}

	spin_unlock(&bitbang->lock);

	spin_unlock_irqrestore(&bitbang->lock, flags);



	return 0;

}