aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi_bitbang.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-01-08 18:32:40 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-08 19:10:35 -0500
commitd52df2e2ea2d881b1439bbdec7f67c27e0f47941 (patch)
treea2035b8336b49e868aa27fec4ecb21294db6cb08 /drivers/spi/spi_bitbang.c
parenta2b484a29cc9f565b013c0e7f1e0cc22dec12456 (diff)
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: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/spi_bitbang.c')
-rw-r--r--drivers/spi/spi_bitbang.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 81639c6be1c7..f7f8580edad8 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -184,6 +184,7 @@ int spi_bitbang_setup(struct spi_device *spi)
184 struct spi_bitbang_cs *cs = spi->controller_state; 184 struct spi_bitbang_cs *cs = spi->controller_state;
185 struct spi_bitbang *bitbang; 185 struct spi_bitbang *bitbang;
186 int retval; 186 int retval;
187 unsigned long flags;
187 188
188 bitbang = spi_master_get_devdata(spi->master); 189 bitbang = spi_master_get_devdata(spi->master);
189 190
@@ -222,12 +223,12 @@ int spi_bitbang_setup(struct spi_device *spi)
222 */ 223 */
223 224
224 /* deselect chip (low or high) */ 225 /* deselect chip (low or high) */
225 spin_lock(&bitbang->lock); 226 spin_lock_irqsave(&bitbang->lock, flags);
226 if (!bitbang->busy) { 227 if (!bitbang->busy) {
227 bitbang->chipselect(spi, BITBANG_CS_INACTIVE); 228 bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
228 ndelay(cs->nsecs); 229 ndelay(cs->nsecs);
229 } 230 }
230 spin_unlock(&bitbang->lock); 231 spin_unlock_irqrestore(&bitbang->lock, flags);
231 232
232 return 0; 233 return 0;
233} 234}