diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/mmc/host/atmel-mci.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
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 |