Commit ceca3893 authored by Antonino Daplas's avatar Antonino Daplas Committed by Linus Torvalds

[PATCH] vesafb: Change return error id

With <Stuart_Hayes@Dell.com>

I'm getting a message in dmesg: "localhost kernel: vesafb: probe of vesafb0
failed with error -6"

I searched the web, and found that a lot of people are getting this, but I
couldn't find an answer, so I looked into it.

This appears to be because "vesafb" returns -ENXIO ("No such device or
address") when its probe function fails.  However, driverse/base/bus.c spews
an error message during device_attach() if a matching driver's probe function
returns anything but -ENODEV ("No such device").
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5244820e
...@@ -229,7 +229,7 @@ static int __init vesafb_probe(struct device *device) ...@@ -229,7 +229,7 @@ static int __init vesafb_probe(struct device *device)
unsigned int size_total; unsigned int size_total;
if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB) if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
return -ENXIO; return -ENODEV;
vesafb_fix.smem_start = screen_info.lfb_base; vesafb_fix.smem_start = screen_info.lfb_base;
vesafb_defined.bits_per_pixel = screen_info.lfb_depth; vesafb_defined.bits_per_pixel = screen_info.lfb_depth;
...@@ -407,7 +407,7 @@ static int __init vesafb_probe(struct device *device) ...@@ -407,7 +407,7 @@ static int __init vesafb_probe(struct device *device)
(ypan) ? FBINFO_HWACCEL_YPAN : 0; (ypan) ? FBINFO_HWACCEL_YPAN : 0;
if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) { if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
err = -ENXIO; err = -ENOMEM;
goto err; goto err;
} }
if (register_framebuffer(info)<0) { if (register_framebuffer(info)<0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment