diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-30 10:07:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-30 10:07:44 -0800 |
| commit | ff20f1779b7f60a9682aa8d62f8ca3b650e4c360 (patch) | |
| tree | dc4ad4ef1365009e1dbb09baf2238db74132022c /drivers/spi/coldfire_qspi.c | |
| parent | ebb76ce16daf6908dc030dec1c00827d37129fe5 (diff) | |
| parent | 0bc463426ab5eb39e76df637b29a4f191d01b8a0 (diff) | |
Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
* 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
spi/m68knommu: Coldfire QSPI platform support
spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition
Diffstat (limited to 'drivers/spi/coldfire_qspi.c')
| -rw-r--r-- | drivers/spi/coldfire_qspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/coldfire_qspi.c b/drivers/spi/coldfire_qspi.c index 052b3c7fa6a..8856bcca9d2 100644 --- a/drivers/spi/coldfire_qspi.c +++ b/drivers/spi/coldfire_qspi.c @@ -317,7 +317,7 @@ static void mcfqspi_work(struct work_struct *work) msg = container_of(mcfqspi->msgq.next, struct spi_message, queue); - list_del_init(&mcfqspi->msgq); + list_del_init(&msg->queue); spin_unlock_irqrestore(&mcfqspi->lock, flags); spi = msg->spi; |