Skip to content

Commit a0d9dc0

Browse files
committed
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 <[email protected]> From: Inki Dae <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents b325b5e + d4f5a09 commit a0d9dc0

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

drivers/gpu/drm/exynos/exynos_drm_dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev,
6161
struct device *subdrv_dev, void **dma_priv)
6262
{
6363
struct exynos_drm_private *priv = drm_dev->dev_private;
64-
int ret;
64+
int ret = 0;
6565

6666
if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) {
6767
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,
9292
if (ret)
9393
clear_dma_max_seg_size(subdrv_dev);
9494

95-
return 0;
95+
return ret;
9696
}
9797

9898
/*

drivers/gpu/drm/exynos/exynos_drm_g2d.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,6 @@ static int g2d_probe(struct platform_device *pdev)
14981498

14991499
g2d->irq = platform_get_irq(pdev, 0);
15001500
if (g2d->irq < 0) {
1501-
dev_err(dev, "failed to get irq\n");
15021501
ret = g2d->irq;
15031502
goto err_put_clk;
15041503
}

drivers/gpu/drm/exynos/exynos_drm_mic.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,10 @@ static void mic_pre_enable(struct drm_bridge *bridge)
269269
goto unlock;
270270

271271
ret = pm_runtime_get_sync(mic->dev);
272-
if (ret < 0)
272+
if (ret < 0) {
273+
pm_runtime_put_noidle(mic->dev);
273274
goto unlock;
275+
}
274276

275277
mic_set_path(mic, 1);
276278

0 commit comments

Comments
 (0)