From 39a883d863bcc3c05d41f3d63deac79a80270103 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 25 Jul 2012 13:51:20 +0100
Subject: [PATCH] --- yaml --- r: 321609 b: refs/heads/master c:
 9978cf50426bc8d386a0753f74ab895e4d6da554 h: refs/heads/master i:   321607:
 3343c517ae9958be0ffe6d888cc634f0cbaf1c5f v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/i915/intel_i2c.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 311325ec8447..4b75ce19367d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0274df3e43be962eee0499ee97c514fdb1c8f3ae
+refs/heads/master: 9978cf50426bc8d386a0753f74ab895e4d6da554
diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c
index 1991a4408cf9..d79500bc1ce5 100644
--- a/trunk/drivers/gpu/drm/i915/intel_i2c.c
+++ b/trunk/drivers/gpu/drm/i915/intel_i2c.c
@@ -540,9 +540,6 @@ void intel_teardown_gmbus(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int i;
 
-	if (dev_priv->gmbus == NULL)
-		return;
-
 	for (i = 0; i < GMBUS_NUM_PORTS; i++) {
 		struct intel_gmbus *bus = &dev_priv->gmbus[i];
 		i2c_del_adapter(&bus->adapter);