Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'exynos-drm-fixes-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

Two fixups
- It fixes wrong return value by returing proper error value instead of
fixed one.
- It fixes ref count leak in mic_pre_enable.
One cleanup
- It removes dev_err() call on platform_get_irq() failure because
platform_get_irq() call dev_err() itself on failure.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1593395988-4612-1-git-send-email-inki.dae@samsung.com

+5 -4
+2 -2
drivers/gpu/drm/exynos/exynos_drm_dma.c
··· 61 61 struct device *subdrv_dev, void **dma_priv) 62 62 { 63 63 struct exynos_drm_private *priv = drm_dev->dev_private; 64 - int ret; 64 + int ret = 0; 65 65 66 66 if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) { 67 67 DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n", ··· 92 92 if (ret) 93 93 clear_dma_max_seg_size(subdrv_dev); 94 94 95 - return 0; 95 + return ret; 96 96 } 97 97 98 98 /*
-1
drivers/gpu/drm/exynos/exynos_drm_g2d.c
··· 1498 1498 1499 1499 g2d->irq = platform_get_irq(pdev, 0); 1500 1500 if (g2d->irq < 0) { 1501 - dev_err(dev, "failed to get irq\n"); 1502 1501 ret = g2d->irq; 1503 1502 goto err_put_clk; 1504 1503 }
+3 -1
drivers/gpu/drm/exynos/exynos_drm_mic.c
··· 269 269 goto unlock; 270 270 271 271 ret = pm_runtime_get_sync(mic->dev); 272 - if (ret < 0) 272 + if (ret < 0) { 273 + pm_runtime_put_noidle(mic->dev); 273 274 goto unlock; 275 + } 274 276 275 277 mic_set_path(mic, 1); 276 278