[Linuxconsole-commit]CVS: ruby/linux/drivers/video fbcmap.c,1.8,1.9

[Paul M. <le...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv2668/drivers/video

Modified Files:
	fbcmap.c 
Log Message:
Add an fb_getcolreg to the fb_ops.. call it from within the get_cmap().



Index: fbcmap.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbcmap.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fbcmap.c	2001/06/07 05:28:57	1.8
+++ fbcmap.c	2001/11/25 04:44:16	1.9
@@ -221,7 +221,7 @@
     blue = cmap->blue;
     transp = cmap->transp;
     start = cmap->start;
-    if (start < 0)
+    if (start < 0 || !info->fbops->fb_getcolreg)
 	return -EINVAL;
     for (i = 0; i < cmap->len; i++) {
 	if (!&info->cmap)
@@ -244,6 +244,8 @@
 	blue++;
 	if (transp)
 	    transp++;
+	if (info->fbops->fb_getcolreg(start++,red,green,blue,transp,info))
+	    return 0;
     }
     return 0;
 }