diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-06-24 11:02:45 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-06-24 11:02:45 +0300 |
commit | 5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28 (patch) | |
tree | 75d09ba90c72e75b3d488edd2c37c96c3f268952 /drivers/gpu/drm/exynos/exynos5433_drm_decon.c | |
parent | 3099406ef4832124ce572cfbbc914e8a385ca38f (diff) | |
parent | 3b7961a326f8a7e03f54a19f02fedae8d488b80f (diff) |
Merge tag 'asoc-fix-v5.13-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Fixes for v5.13
A final batch of fixes for v5.13, this is larger than I'd like due to
the fixes for a series of suspend issues that Intel turned up in their
testing this week.
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos5433_drm_decon.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index b9a4b7670a89..197b97341cad 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -815,10 +815,8 @@ static int exynos5433_decon_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctx->addr = devm_ioremap_resource(dev, res); - if (IS_ERR(ctx->addr)) { - dev_err(dev, "ioremap failed\n"); + if (IS_ERR(ctx->addr)) return PTR_ERR(ctx->addr); - } ret = decon_conf_irq(ctx, "vsync", decon_irq_handler, 0); if (ret < 0) |