From 5d3366b12fad10aefbe871efffb15d6b6170c450 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 8 May 2007 00:38:18 -0700
Subject: [PATCH] --- yaml --- r: 54902 b: refs/heads/master c:
 5b358fe12f03a7822db6f376b608f996c664a952 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/video/riva/fbdev.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8e3e9eb08c4b..afc38572a0cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e73db2536695ef95458b0043234456eb42a8962
+refs/heads/master: 5b358fe12f03a7822db6f376b608f996c664a952
diff --git a/trunk/drivers/video/riva/fbdev.c b/trunk/drivers/video/riva/fbdev.c
index a37189a227ac..b8d50f178ad5 100644
--- a/trunk/drivers/video/riva/fbdev.c
+++ b/trunk/drivers/video/riva/fbdev.c
@@ -1789,6 +1789,8 @@ static int __devinit riva_get_EDID_i2c(struct fb_info *info)
 	NVTRACE_ENTER();
 	riva_create_i2c_busses(par);
 	for (i = 0; i < par->bus; i++) {
+		if (!par->chan[i].par)
+			continue;
 		riva_probe_i2c_connector(par, i+1, &par->EDID);
 		if (par->EDID && !fb_parse_edid(par->EDID, &var)) {
 			printk(PFX "Found EDID Block from BUS %i\n", i);