From da845b98588715deb79844eda8b5582179489048 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 19 Nov 2012 09:44:56 +0000
Subject: [PATCH] --- yaml --- r: 345308 b: refs/heads/master c:
 9e1c156ff04b1920c33b59c5b8564afc8bf4f2cd h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_crtc.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2591d1e135bd..8be2b4dc7daf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3cc3520dc2f554b9686b8fc5773d8b8bc8e9c9a
+refs/heads/master: 9e1c156ff04b1920c33b59c5b8564afc8bf4f2cd
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
index 7ac3952f74fc..9fd0c3555c30 100644
--- a/trunk/drivers/gpu/drm/drm_crtc.c
+++ b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -470,10 +470,8 @@ void drm_crtc_cleanup(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
 
-	if (crtc->gamma_store) {
-		kfree(crtc->gamma_store);
-		crtc->gamma_store = NULL;
-	}
+	kfree(crtc->gamma_store);
+	crtc->gamma_store = NULL;
 
 	drm_mode_object_put(dev, &crtc->base);
 	list_del(&crtc->head);