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 262/563] uio: uio_dmem_genirq: Catch the Exception
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ]

    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.

    Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/uio/uio_dmem_genirq.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
    index ec7f66f4555a6..bf39a424ea77d 100644
    --- a/drivers/uio/uio_dmem_genirq.c
    +++ b/drivers/uio/uio_dmem_genirq.c
    @@ -183,7 +183,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
    goto bad0;
    }

    - 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;
    + }

    priv->uioinfo = uioinfo;
    spin_lock_init(&priv->lock);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-09-17 16:14    [W:2.266 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site