Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d8aa4ef authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-06-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v4.18-rc3:
- A single fix in meson for an unhandled error path in meson_drv_bind_master().

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

Link: https://patchwork.freedesktop.org/patch/msgid/fa740f31-5a8d-ed45-5e8a-aecd3f6f11b7@linux.intel.com
parents d12bce95 01a9e949

drivers/gpu/drm/meson/meson_drv.c

+8 −4
Original line number Diff line number Diff line
@@ -197,8 +197,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) 
	priv->io_base = regs;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi");

	if (!res)

		return -EINVAL;

	if (!res) {

		ret = -EINVAL;

		goto free_drm;

	}

	/* Simply ioremap since it may be a shared register zone */

	regs = devm_ioremap(dev, res->start, resource_size(res));

	if (!regs) {
@@ -215,8 +217,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) 
	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc");

	if (!res)

		return -EINVAL;

	if (!res) {

		ret = -EINVAL;

		goto free_drm;

	}

	/* Simply ioremap since it may be a shared register zone */

	regs = devm_ioremap(dev, res->start, resource_size(res));

	if (!regs) {