patch-2.1.78 linux/drivers/char/pms.c

Next file: linux/drivers/char/rocket.c
Previous file: linux/drivers/char/ftape/compressor/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.77/linux/drivers/char/pms.c linux/drivers/char/pms.c
@@ -612,7 +612,7 @@
 	int dw = 2*dev->width;
 	char *src = (char *)bus_to_virt((void *)mem_base);
 
-	char tmp[dw+16]; /* using a temp buffer is faster than direct  */
+	char tmp[dw+32]; /* using a temp buffer is faster than direct  */
 	int cnt = 0;
 	int len=0;
 	unsigned char r8 = 0x5;  /* value for reg8  */
@@ -626,7 +626,7 @@
 	for (y = 0; y < dev->height; y++ ) 
 	{
 		*src = 0;  /* synchronisiert neue Zeile */
-		memcpy(tmp, src, dw+16); /* discard 8 word   */
+		memcpy(tmp, src, dw+32); /* discard 16 word   */
 		cnt -= dev->height;
 		while (cnt <= 0) 
 		{ 
@@ -637,7 +637,7 @@
 			if(dt+len>count)
 				dt=count-len;
 			cnt += dev->height;
-			copy_to_user(buf, tmp+16, dt);
+			copy_to_user(buf, tmp+32, dt);
 			buf += dt;    
 			len += dt;
 		}
@@ -814,10 +814,10 @@
 			 *	Now load the card.
 			 */
 
-			pms_brightness(p.brightness);
-			pms_hue(p.hue);
-			pms_colour(p.colour);
-			pms_contrast(p.contrast);	
+			pms_brightness(p.brightness>>8);
+			pms_hue(p.hue>>8);
+			pms_colour(p.colour>>8);
+			pms_contrast(p.contrast>>8);	
 			return 0;
 		}
 		case VIDIOCSWIN:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov