diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 12:47:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 12:47:28 +0100 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /drivers/mmc/host/atmel-mci.c | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
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 76bfe16c09b..2b1196e6142 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) { struct dw_dma_slave *dws = slave; - if (dws->dma_dev == chan->device->dev) + if (dws->dma_dev == chan->device->dev) { + chan->private = dws; return true; - else + } else return false; } #endif |