diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-02-01 12:01:14 -0500 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-02-01 12:01:28 -0500 |
| commit | e7211718b3aa0365a723d9b8192e6f50236a1c67 (patch) | |
| tree | 35564f1a9a9fbc5eaaad2ce9e924c99afb98dcce /drivers | |
| parent | ba7932334fbede4bb6a4ff4e635391ca7833203f (diff) | |
| parent | c8ddf036d99e7fab943b7587c75a905e789ea7e7 (diff) | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/shdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 54043cd831c8..812fd76e9c18 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
| @@ -1262,7 +1262,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev) | |||
| 1262 | 1262 | ||
| 1263 | INIT_LIST_HEAD(&shdev->common.channels); | 1263 | INIT_LIST_HEAD(&shdev->common.channels); |
| 1264 | 1264 | ||
| 1265 | dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask); | 1265 | if (!pdata->slave_only) |
| 1266 | dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask); | ||
| 1266 | if (pdata->slave && pdata->slave_num) | 1267 | if (pdata->slave && pdata->slave_num) |
| 1267 | dma_cap_set(DMA_SLAVE, shdev->common.cap_mask); | 1268 | dma_cap_set(DMA_SLAVE, shdev->common.cap_mask); |
| 1268 | 1269 | ||