From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 8 Aug 2017 16:29:52 +0000 (-0700)
Subject: 4.4-stable patches
X-Git-Tag: v4.12.6~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d89875d0a1c7490820b071921e557c7bafd9107;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	drm-rcar-du-fix-backport-bug.patch
---

diff --git a/queue-4.4/drm-rcar-du-fix-backport-bug.patch b/queue-4.4/drm-rcar-du-fix-backport-bug.patch
new file mode 100644
index 00000000000..b823ce0f33c
--- /dev/null
+++ b/queue-4.4/drm-rcar-du-fix-backport-bug.patch
@@ -0,0 +1,31 @@
+From 6a44a190d46c7356ed9c139db9a4643c8e945a39 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 8 Aug 2017 09:26:41 -0700
+Subject: drm: rcar-du: fix backport bug
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+In the backport of commit 4f7b0d263833 ("drm: rcar-du: Simplify and fix
+probe error handling"), which is commit 8255d26322a3 in this tree, the
+error handling path was incorrect.  This patch fixes it up.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+Cc: thongsyho <thong.ho.px@rvc.renesas.com>
+Cc: Nhan Nguyen <nhan.nguyen.yb@renesas.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
++++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+@@ -296,7 +296,7 @@ static int rcar_du_probe(struct platform
+ 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ 	rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem);
+ 	if (IS_ERR(rcdu->mmio))
+-		ret = PTR_ERR(rcdu->mmio);
++		return PTR_ERR(rcdu->mmio);
+ 
+ 	/* DRM/KMS objects */
+ 	ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev);
diff --git a/queue-4.4/series b/queue-4.4/series
index 0b95b06a632..5f08aa8755c 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -18,3 +18,4 @@ iser-target-avoid-isert_conn-cm_id-dereference-in-isert_login_recv_done.patch
 mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries.patch
 media-lirc-lirc_get_rec_resolution-should-return-microseconds.patch
 f2fs-sanity-check-checkpoint-segno-and-blkoff.patch
+drm-rcar-du-fix-backport-bug.patch