diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2018-03-21 10:30:22 +0200 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2018-03-27 17:43:42 +0530 |
| commit | f31b323675c11e41c117a4d31be3e93a9f79a07c (patch) | |
| tree | 92788d8e29b5cfd9067ce6b4d32ef9a25eb2cc99 /drivers/dma | |
| parent | Linux 4.16-rc1 (diff) | |
| download | linux-dev-f31b323675c11e41c117a4d31be3e93a9f79a07c.tar.xz linux-dev-f31b323675c11e41c117a4d31be3e93a9f79a07c.zip | |
dmaengine: edma: Check the memory allocation for the memcpy dma device
If the allocation fails then disable the memcpy support.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/edma.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 948df1ab5f1a..85ea92fcea54 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -1876,6 +1876,11 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode) if (memcpy_channels) { m_ddev = devm_kzalloc(ecc->dev, sizeof(*m_ddev), GFP_KERNEL); + if (!m_ddev) { + dev_warn(ecc->dev, "memcpy is disabled due to OoM\n"); + memcpy_channels = NULL; + goto ch_setup; + } ecc->dma_memcpy = m_ddev; dma_cap_zero(m_ddev->cap_mask); @@ -1903,6 +1908,7 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode) dev_info(ecc->dev, "memcpy is disabled\n"); } +ch_setup: for (i = 0; i < ecc->num_channels; i++) { struct edma_chan *echan = &ecc->slave_chans[i]; echan->ch_num = EDMA_CTLR_CHAN(ecc->id, i); |