From: Daniel Kurtz <djkurtz@chromium.org>
Date: Mon, 6 May 2013 17:36:42 +0000 (-0700)
Subject: CHROMIUM: drm/exynos: Fixup init failure cleanup path
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=e2f5db4a0625477194fe5284e89935a3acdfe1b2

CHROMIUM: drm/exynos: Fixup init failure cleanup path

Backport from 3.8-rebase version of this patch.

Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>

TEST=by hand
BUG=none

Original-Change-Id: Ia0c0de4f49efe0d6dca09507372add5d0d533028
Reviewed-on: https://gerrit.chromium.org/gerrit/49146
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Queue: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
(cherry picked from commit fa2b424b2108697ee5a971bc00b9a8bb75f66b41)

Change-Id: I09d0d33a9499945e67fb8416c0074a440fd5b5a2
Reviewed-on: https://gerrit.chromium.org/gerrit/50188
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
---

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 7dfe412ac79c..9462a85df4bf 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -150,19 +150,19 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
 	ret = find_bridge("ptn3460-bridge", &bridge);
 	if (ret) {
 		DRM_ERROR("Could not get PTN3460 bridge %d\n", ret);
-		goto err_kds;
+		goto err_vblank;
 	}
 	if (bridge.valid) {
 		ret = ptn3460_init(dev, bridge.client, bridge.node);
 		if (ret) {
 			DRM_ERROR("Failed to initialize the ptn bridge\n");
-			goto err_kds;
+			goto err_vblank;
 		}
 	} else {
 		ret = find_bridge("ps8622-bridge", &bridge);
 		if (ret) {
 			DRM_ERROR("Could not get PS8622 bridge %d\n", ret);
-			goto err_kds;
+			goto err_vblank;
 		}
 
 		if (bridge.valid) {
@@ -170,7 +170,7 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
 			if (ret) {
 				DRM_ERROR("Failed to initialize the Parade "
 					  "bridge\n");
-				goto err_kds;
+				goto err_vblank;
 			}
 		}
 	}