---

yaml --- r: 334399 b: refs/heads/master c: 0829184 h: refs/heads/master i: 334397: 7410a8e 334395: a99f309 334391: f24d151 334383: da0cab4 334367: 43896ef 334335: 5a91003 v: v3
git-mirror · Oct 15, 2012 · 81eba23 · 81eba23
1 parent ff201cc
commit 81eba23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3691feea9826771d853d28d37b6b6e34758fa66d
+refs/heads/master: 082918471139b07964967cfe5f70230909c82ae1
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/trunk/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -991,11 +991,7 @@ static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder,
 static void radeon_ext_tmds_enc_destroy(struct drm_encoder *encoder)
 {
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-	struct radeon_encoder_ext_tmds *tmds = radeon_encoder->enc_priv;
-	if (tmds) {
-		if (tmds->i2c_bus)
-			radeon_i2c_destroy(tmds->i2c_bus);
-	}
+	/* don't destroy the i2c bus record here, this will be done in radeon_i2c_fini */
 	kfree(radeon_encoder->enc_priv);
 	drm_encoder_cleanup(encoder);
 	kfree(radeon_encoder);