lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 165/563] media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit 43f0633f89947df57fe0b5025bdd741768007708 ]

    The return value of dma_set_coherent_mask() is not always 0.
    To catch the exception in case that dma is not support the mask.

    Link: https://lore.kernel.org/linux-media/20211206022201.1639460-1-jiasheng@iscas.ac.cn
    Fixes: b0444f18e0b1 ("[media] coda: add i.MX6 VDOA driver")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/coda/imx-vdoa.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/coda/imx-vdoa.c
    index 8bc0d83718193..dd6e2e320264e 100644
    --- a/drivers/media/platform/coda/imx-vdoa.c
    +++ b/drivers/media/platform/coda/imx-vdoa.c
    @@ -287,7 +287,11 @@ static int vdoa_probe(struct platform_device *pdev)
    struct resource *res;
    int ret;

    - dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
    + ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
    + if (ret) {
    + dev_err(&pdev->dev, "DMA enable failed\n");
    + return ret;
    + }

    vdoa = devm_kzalloc(&pdev->dev, sizeof(*vdoa), GFP_KERNEL);
    if (!vdoa)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:41    [W:4.581 / U:1.892 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site