From 69280ec05a970da22f57d81fd6324ff42f310ec5 Mon Sep 17 00:00:00 2001
From: YAMANE Toshiaki <yamanetoshi@gmail.com>
Date: Wed, 14 Nov 2012 19:28:54 +0900
Subject: [PATCH] --- yaml --- r: 337956 b: refs/heads/master c:
 fdbf20b3b0a58c3ed115dfba4fe8b87385ad4cbc h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/omapdrm/omap_connector.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0d5b080fe6d4..34afcf3873a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6c2f47f30c44f3fdae9362f811f95109f81303e
+refs/heads/master: fdbf20b3b0a58c3ed115dfba4fe8b87385ad4cbc
diff --git a/trunk/drivers/staging/omapdrm/omap_connector.c b/trunk/drivers/staging/omapdrm/omap_connector.c
index 38be186c249a..91edb3f96972 100644
--- a/trunk/drivers/staging/omapdrm/omap_connector.c
+++ b/trunk/drivers/staging/omapdrm/omap_connector.c
@@ -146,11 +146,10 @@ enum drm_connector_status omap_connector_detect(
 	enum drm_connector_status ret;
 
 	if (dssdrv->detect) {
-		if (dssdrv->detect(dssdev)) {
+		if (dssdrv->detect(dssdev))
 			ret = connector_status_connected;
-		} else {
+		else
 			ret = connector_status_disconnected;
-		}
 	} else {
 		ret = connector_status_unknown;
 	}
@@ -383,9 +382,8 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
 	return connector;
 
 fail:
-	if (connector) {
+	if (connector)
 		omap_connector_destroy(connector);
-	}
 
 	return NULL;
 }