patch-2.4.9 linux/drivers/sound/dmasound/dmasound_q40.c

• Lines: 54
• Date: Wed Aug 15 01:22:16 2001
• Orig file: v2.4.8/linux/drivers/sound/dmasound/dmasound_q40.c
• Orig date: Fri Feb 9 11:30:23 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/sound/dmasound/dmasound_q40.c linux/drivers/sound/dmasound/dmasound_q40.c
@@ -58,7 +58,7 @@
 	ssize_t count, used;
 	u_char *p = (u_char *) &frame[*frameUsed];
 
-	used = count = min(userCount, frameLeft);
+	used = count = min(unsigned long, userCount, frameLeft);
 	if (copy_from_user(p,userPtr,count))
 	  return -EFAULT;
 	while (count > 0) {
@@ -84,7 +84,7 @@
 	frameLeft >>= 1;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(userCount, frameLeft);
+	used = count = min(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 		if (get_user(data, userPtr++))
@@ -112,7 +112,7 @@
 	ssize_t count, used;
 	u_char *p = (u_char *) &frame[*frameUsed];
 
-	used = count = min(userCount, frameLeft);
+	used = count = min(unsigned long, userCount, frameLeft);
 	if (copy_from_user(p,userPtr,count))
 	  return -EFAULT;
 	while (count > 0) {
@@ -136,7 +136,7 @@
 	frameLeft >>= 1;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(userCount, frameLeft);
+	used = count = min(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 		if (get_user(data, userPtr++))
@@ -164,7 +164,7 @@
 	ssize_t count, used;
 	u_char *p = (u_char *) &frame[*frameUsed];
 
-	used = count = min(userCount, frameLeft);
+	used = count = min(unsigned long, userCount, frameLeft);
 	if (copy_from_user(p,userPtr,count))
 	  return -EFAULT;
 	*frameUsed += used;
@@ -184,7 +184,7 @@
 	frameLeft >>= 1;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(userCount, frameLeft);
+	used = count = min(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 		if (get_user(data, userPtr++))