diff options
| author | Jean Delvare <khali@linux-fr.org> | 2007-05-08 09:38:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:15:28 +0200 |
| commit | 5b358fe12f03a7822db6f376b608f996c664a952 (patch) | |
| tree | 617e4ef533374a9df4f66e1ef32bb1ca31a3cb81 /drivers/video/riva | |
| parent | rivafb/nvidiafb: Enable hardware monitoring (diff) | |
| download | linux-5b358fe12f03a7822db6f376b608f996c664a952.tar.xz linux-5b358fe12f03a7822db6f376b608f996c664a952.zip | |
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>
Diffstat (limited to 'drivers/video/riva')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index a37189a227ac..b8d50f178ad5 100644 --- 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); |