From c9b53199fcd5a48d2c4773e554743fa8c00a419d Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Wed, 9 Dec 2009 17:26:25 +0100
Subject: [PATCH] --- yaml --- r: 184846 b: refs/heads/master c:
 92fe0ff16a9299233104187bd6ceb2101501badc h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/video/omap2/displays/panel-taal.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 857c00eec0e6..44b2d4235c6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80b1cc23ac96373bd5ff17f8959f2587d6fc37dd
+refs/heads/master: 92fe0ff16a9299233104187bd6ceb2101501badc
diff --git a/trunk/drivers/video/omap2/displays/panel-taal.c b/trunk/drivers/video/omap2/displays/panel-taal.c
index 1f01dfc5e52e..0aaaa8a8e0f5 100644
--- a/trunk/drivers/video/omap2/displays/panel-taal.c
+++ b/trunk/drivers/video/omap2/displays/panel-taal.c
@@ -510,7 +510,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 	if (td->esd_wq == NULL) {
 		dev_err(&dssdev->dev, "can't create ESD workqueue\n");
 		r = -ENOMEM;
-		goto err2;
+		goto err1;
 	}
 	INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
 
@@ -528,7 +528,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
 			&taal_bl_ops);
 	if (IS_ERR(bldev)) {
 		r = PTR_ERR(bldev);
-		goto err1;
+		goto err2;
 	}
 
 	td->bldev = bldev;