diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/mmc/host/atmel-mci.c | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/mmc/host/atmel-mci.c')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 76bfe16c09b1..2b1196e6142c 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
| @@ -1548,9 +1548,10 @@ static bool filter(struct dma_chan *chan, void *slave) | |||
| 1548 | { | 1548 | { |
| 1549 | struct dw_dma_slave *dws = slave; | 1549 | struct dw_dma_slave *dws = slave; |
| 1550 | 1550 | ||
| 1551 | if (dws->dma_dev == chan->device->dev) | 1551 | if (dws->dma_dev == chan->device->dev) { |
| 1552 | chan->private = dws; | ||
| 1552 | return true; | 1553 | return true; |
| 1553 | else | 1554 | } else |
| 1554 | return false; | 1555 | return false; |
| 1555 | } | 1556 | } |
| 1556 | #endif | 1557 | #endif |