The patch titled rivafb: handle I2C bus creation failure has been added to the -mm tree. Its filename is rivafb-handle-i2c-bus-creation-failure.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: rivafb: handle I2C bus creation failure From: Jean Delvare <khali@xxxxxxxxxxxx> I2C bus creation may fail, let rivafb handle that case properly. Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx> Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/riva/fbdev.c | 2 ++ 1 files changed, 2 insertions(+) diff -puN drivers/video/riva/fbdev.c~rivafb-handle-i2c-bus-creation-failure drivers/video/riva/fbdev.c --- a/drivers/video/riva/fbdev.c~rivafb-handle-i2c-bus-creation-failure +++ a/drivers/video/riva/fbdev.c @@ -1789,6 +1789,8 @@ static int __devinit riva_get_EDID_i2c(s 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); _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are x86-msr-add-support-for-safe-variants.patch git-alsa.patch git-dvb.patch i2c-replace-more-deprecated-sa_xxx-interrupt-flags.patch apple-smc-driver-hardware-monitoring-and-control.patch git-ieee1394.patch git-netdev-all.patch git-net.patch xtensa-strlcpy-is-smart-enough.patch oss-strlcpy-is-smart-enough.patch rtc-add-rtc-class-driver-for-the-maxim-max6900.patch legacy-pc-parports-support-parport-dev.patch layered-parport-code-uses-parport-dev.patch fbdev-dont-show-logo-if-driver-or-fbcon-are-modular.patch rivafb-handle-i2c-bus-creation-failure.patch rivafb-nvidiafb-various-cleanups.patch rivafb-fixed-reversed-ddc-ports.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html