diff options
author | Jaehoon Chung <jh80.chung@samsung.com> | 2012-04-18 15:42:31 +0900 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-04-20 21:52:05 -0400 |
commit | e1631f989e0c6c8d9b43a2dbdd1097f70da603a5 (patch) | |
tree | 4b258ea786edda6cc9903319459143cc10d50775 | |
parent | b89152824f993a9572b47eb31f4579feadeac34c (diff) | |
download | linux-e1631f989e0c6c8d9b43a2dbdd1097f70da603a5.tar.bz2 |
mmc: dw_mmc: prevent NULL dereference for dma_ops
Now, dma_ops is assumed that use the IDMAC. But if dma_ops is assigned
the pdata->dma_ops, we didn't ensure that callback function is defined.
If the callback isn't defined, then we should run in PIO mode.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/dw_mmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index f3b0fcd002df..ab3fc4617107 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1881,7 +1881,8 @@ static void dw_mci_init_dma(struct dw_mci *host) if (!host->dma_ops) goto no_dma; - if (host->dma_ops->init) { + if (host->dma_ops->init && host->dma_ops->start && + host->dma_ops->stop && host->dma_ops->cleanup) { if (host->dma_ops->init(host)) { dev_err(&host->dev, "%s: Unable to initialize " "DMA Controller.\n", __func__); |