The patch titled pm2fb: correct error values returned from probe function has been added to the -mm tree. Its filename is pm2fb-correct-error-values-returned-from-probe-function.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** 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 The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pm2fb: correct error values returned from probe function From: Krzysztof Helt <krzysztof.h1@xxxxx> Fix error values returned in some code branches in the pm2fb_probe() function. Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/pm2fb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/video/pm2fb.c~pm2fb-correct-error-values-returned-from-probe-function drivers/video/pm2fb.c --- a/drivers/video/pm2fb.c~pm2fb-correct-error-values-returned-from-probe-function +++ a/drivers/video/pm2fb.c @@ -1687,10 +1687,12 @@ static int __devinit pm2fb_probe(struct if (!err || err == 4) info->var = pm2fb_var; - if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) + retval = fb_alloc_cmap(&info->cmap, 256, 0); + if (retval < 0) goto err_exit_both; - if (register_framebuffer(info) < 0) + retval = register_framebuffer(info); + if (retval < 0) goto err_exit_all; printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n", _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are pm2fb-correct-error-values-returned-from-probe-function.patch pm2fb-change-option-mode-to-mode_option.patch tridentfb-change-option-mode-to-mode_option.patch pm3fb-change-option-mode-to-mode_option.patch update-modedbtxt-documentation-about-mode_option-parameter-change.patch vt8623fb-change-option-mode-to-mode_option.patch arkfb-add-option-mode_option.patch s3fb-add-option-mode_option.patch fbdev-add-removed-option-mode-to-keep-compatibility.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