diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-05 01:31:08 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-05 01:31:08 +0300 |
| commit | 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 (patch) | |
| tree | dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57 /drivers/spi/coldfire_qspi.c | |
| parent | 204663c48711ddceee09df46269cd34d49d1f7be (diff) | |
| parent | 989d873fc5b6a96695b97738dea8d9f02a60f8ab (diff) | |
| download | linux-4f125010d2d02c481a0fdf5aee23a9f937bc5de1.tar.xz | |
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
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 052b3c7fa6a0..8856bcca9d29 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; |