From 4a6fef5ddda9a40fa424a661923124b8997e1bed Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 8 Jan 2008 15:32:40 -0800 Subject: [PATCH] --- yaml --- r: 75299 b: refs/heads/master c: d52df2e2ea2d881b1439bbdec7f67c27e0f47941 h: refs/heads/master i: 75297: 826f51c362aa7c13a7733ea3a2bc1cf6eb68babf 75295: 52538eff62db0f6ae5164234746dd3a22bcd20f0 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_bitbang.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index deef63731862..d37cc2f72622 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2b484a29cc9f565b013c0e7f1e0cc22dec12456 +refs/heads/master: d52df2e2ea2d881b1439bbdec7f67c27e0f47941 diff --git a/trunk/drivers/spi/spi_bitbang.c b/trunk/drivers/spi/spi_bitbang.c index 81639c6be1c7..f7f8580edad8 100644 --- a/trunk/drivers/spi/spi_bitbang.c +++ b/trunk/drivers/spi/spi_bitbang.c @@ -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; }