From 1356346d942dccdab46ab0a3d50f39af84b4ffad Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 10 Apr 2012 12:14:27 -0400
Subject: [PATCH] --- yaml --- r: 298991 b: refs/heads/master c:
 46783150a6552f9513f08e62cfcc07125d6e502b h: refs/heads/master i:   298989:
 b8410ba3d460329cd88f008e54f7cce3894e048c   298987:
 b9400eeaced54cc37711d3997d30ad7f0073f94e   298983:
 dfab8e8468ce8a1cfb7520e657d6b6dfc525d7a8   298975:
 3e489e245622cf863716d09a8b565014b0b1b985 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ebc05ba2318c..c7889754dbd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6069a4c988d75c0fb309fa7da0909df2a222a65e
+refs/heads/master: 46783150a6552f9513f08e62cfcc07125d6e502b
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_i2c.c b/trunk/drivers/gpu/drm/radeon/radeon_i2c.c
index 85bcfc8923a7..3edec1c198e3 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -900,6 +900,10 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
 	struct radeon_i2c_chan *i2c;
 	int ret;
 
+	/* don't add the mm_i2c bus unless hw_i2c is enabled */
+	if (rec->mm_i2c && (radeon_hw_i2c == 0))
+		return NULL;
+
 	i2c = kzalloc(sizeof(struct radeon_i2c_chan), GFP_KERNEL);
 	if (i2c == NULL)
 		return NULL;