| 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); |
