Commit 02a84c13 authored Feb 01, 2017 by Dave Airlie

Merge tag 'sunxi-drm-for-4.11' of...

Merge tag 'sunxi-drm-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next

Allwinner DRM changes for 4.11

Just one minor fix.

* tag 'sunxi-drm-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  drm/sun4i: Fix a return value in case of error

parents b75e1695 0f0861e3

drivers/gpu/drm/sun4i/sun4i_backend.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ int sun4i_backend_update_layer_formats(struct sun4i_backend *backend,
		&val);
		if (ret) {
		DRM_DEBUG_DRIVER("Invalid format\n");
		return val;
		return ret;
		}

		regmap_update_bits(backend->regs, SUN4I_BACKEND_ATTCTL_REG1(layer),