rivafb: handle I2C bus creation failure

I2C bus creation may fail, let rivafb handle that case properly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index a37189a227acf7d835ab608e048f58110c9b9054..b8d50f178ad5a3f12aa0c9ccbec1d7fc78009c0d 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/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);