diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-21 15:59:23 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-21 15:59:23 -0300 |
commit | f248d687e99da6799a25bbf53ca1350b84d41077 (patch) | |
tree | edb0b90c039e34e838329ca4d96e9888a4ebfa34 /drivers/gpu/drm/exynos/exynos_drm_dsi.c | |
parent | 3b2f17ad1770e51b8b4e68b5069c4f1ee477eff8 (diff) | |
parent | 011ff616ffe8df6b86ee54d14a43c8d1a96a6325 (diff) | |
download | linux-f248d687e99da6799a25bbf53ca1350b84d41077.tar.gz linux-f248d687e99da6799a25bbf53ca1350b84d41077.tar.bz2 linux-f248d687e99da6799a25bbf53ca1350b84d41077.zip |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To pick up more UAPI updates to sync with tools/.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_dsi.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 44e402b7cdfb..2d2fe5ab26e7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1786,10 +1786,8 @@ static int exynos_dsi_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); dsi->reg_base = devm_ioremap_resource(dev, res); - if (IS_ERR(dsi->reg_base)) { - dev_err(dev, "failed to remap io region\n"); + if (IS_ERR(dsi->reg_base)) return PTR_ERR(dsi->reg_base); - } dsi->phy = devm_phy_get(dev, "dsim"); if (IS_ERR(dsi->phy)) { |