projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: Kill overly verbose "power state" log messages
[deliverable/linux.git]
/
drivers
/
video
/
fm2fb.c
diff --git
a/drivers/video/fm2fb.c
b/drivers/video/fm2fb.c
index 998374cfae6d0686f992cc00938bf4d460a436ec..6c91c61cdb63824f1482e08407b8390ee8e59414 100644
(file)
--- a/
drivers/video/fm2fb.c
+++ b/
drivers/video/fm2fb.c
@@
-195,13
+195,15
@@
static int fm2fb_blank(int blank, struct fb_info *info)
static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info)
{
static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info)
{
- if (regno > info->cmap.len)
- return 1;
- red >>= 8;
- green >>= 8;
- blue >>= 8;
+ if (regno < 16) {
+ red >>= 8;
+ green >>= 8;
+ blue >>= 8;
+
+ ((u32*)(info->pseudo_palette))[regno] = (red << 16) |
+ (green << 8) | blue;
+ }
- ((u32*)(info->pseudo_palette))[regno] = (red << 16) | (green << 8) | blue;
return 0;
}
return 0;
}
@@
-237,7
+239,7
@@
static int __devinit fm2fb_probe(struct zorro_dev *z,
if (!zorro_request_device(z,"fm2fb"))
return -ENXIO;
if (!zorro_request_device(z,"fm2fb"))
return -ENXIO;
- info = framebuffer_alloc(
25
6 * sizeof(u32), &z->dev);
+ info = framebuffer_alloc(
1
6 * sizeof(u32), &z->dev);
if (!info) {
zorro_release_device(z);
return -ENOMEM;
if (!info) {
zorro_release_device(z);
return -ENOMEM;
@@
-283,6
+285,7
@@
static int __devinit fm2fb_probe(struct zorro_dev *z,
if (register_framebuffer(info) < 0) {
fb_dealloc_cmap(&info->cmap);
if (register_framebuffer(info) < 0) {
fb_dealloc_cmap(&info->cmap);
+ iounmap(info->screen_base);
framebuffer_release(info);
zorro_release_device(z);
return -EINVAL;
framebuffer_release(info);
zorro_release_device(z);
return -EINVAL;
This page took
0.024606 seconds
and
5
git commands to generate.