diff options
author | Dave Airlie <airlied@redhat.com> | 2021-06-02 12:06:43 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-06-02 12:40:26 +1000 |
commit | 43ed3c6c786d996a264fcde68dbb36df6f03b965 (patch) | |
tree | 7c5a6c6745f6cc57d36a4471a6ccab188b70d140 /drivers/gpu/drm/mcde/mcde_dsi.c | |
parent | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff) | |
parent | 2e290c8d8d29278b9a20e2765ab8f6df02f2e707 (diff) | |
download | linux-43ed3c6c786d996a264fcde68dbb36df6f03b965.tar.gz |
Merge tag 'drm-misc-next-2021-06-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.14: UAPI Changes: * Use DRM driver names for fbdev Cross-subsystem Changes: Core Changes: * Fix leaked DMA handles * Improve documentation around DRM_CLIENT_CAP_* * Cleanups * dp_mst: Use kHz as link-rate unit during init * fourcc: Remove drm_gem_format_name() and drm_format_name_buf * gem-cma: Fix mmap for buffers with write combining * ttm: Don't override pre-set vm_ops; ttm_bo_mmap() removal and cleanups Driver Changes: * drm/amdgpu: Fix hot unplug during suspend; Implement mmap as GEM object function; Use %p4cc format-string modifier; Cleanups * drm/bridge: Cdns: Fix PM reference leak, Cleanups; Lt8912b: Fix Coccinelle warnings; Fix Kconfig dependencies; Fixes and cleanups * drm/hisilicon/kirin: Cleanups * drm/nouveau: Implement mmap as GEM object function * drm/radeon: Implement mmap as GEM object function * drm/rockchip: Remove generic drivers during init; Add scaling for RK3036 win1; Fix missing registers for RK3066 and 3188; Add alpha support for RK3036, RK3066, RK3126 and RK3188; Fixes and cleanups * drm/simpledrm: Use %p4cc: format-string modifier * drm/vmwgfx: Cleanups * fbdev/matrox: Use modern module_init() Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/YLZOKiYE6XFmE/MH@linux-uq9g.fritz.box
Diffstat (limited to 'drivers/gpu/drm/mcde/mcde_dsi.c')
-rw-r--r-- | drivers/gpu/drm/mcde/mcde_dsi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index b3fd3501c412..5aade1d13961 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -1196,10 +1196,8 @@ static int mcde_dsi_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); d->regs = devm_ioremap_resource(dev, res); - if (IS_ERR(d->regs)) { - dev_err(dev, "no DSI regs\n"); + if (IS_ERR(d->regs)) return PTR_ERR(d->regs); - } dsi_id = readl(d->regs + DSI_ID_REG); dev_info(dev, "HW revision 0x%08x\n", dsi_id); |