---

yaml --- r: 298991 b: refs/heads/master c: 4678315 h: refs/heads/master i: 298989: b8410ba 298987: b9400ee 298983: dfab8e8 298975: 3e489e2 v: v3
git-mirror · Apr 11, 2012 · 1356346 · 1356346
1 parent a38e710
commit 1356346
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;