lkml.org 
[lkml]   [2020]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 04/30] drm/exynos: Properly propagate return value in drm_iommu_attach_device()
    Date
    From: Marek Szyprowski <m.szyprowski@samsung.com>

    [ Upstream commit b9c633882de4601015625f9136f248e9abca8a7a ]

    Propagate the proper error codes from the called functions instead of
    unconditionally returning 0.

    Reported-by: kbuild test robot <lkp@intel.com>
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Merge conflict so merged it manually.
    Signed-off-by: Inki Dae <inki.dae@samsung.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/exynos/exynos_drm_dma.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c
    index 619f81435c1b2..58b89ec11b0eb 100644
    --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c
    +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c
    @@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev,
    struct device *subdrv_dev, void **dma_priv)
    {
    struct exynos_drm_private *priv = drm_dev->dev_private;
    - int ret;
    + int ret = 0;

    if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {
    DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n",
    @@ -92,7 +92,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev,
    if (ret)
    clear_dma_max_seg_size(subdrv_dev);

    - return 0;
    + return ret;
    }

    /*
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-07-08 17:44    [W:4.173 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site