patch-2.4.10 linux/drivers/sound/dmasound/dmasound_awacs.c

Next file: linux/drivers/sound/dmasound/dmasound_paula.c
Previous file: linux/drivers/sound/dmasound/dmasound_atari.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/sound/dmasound/dmasound_awacs.c linux/drivers/sound/dmasound/dmasound_awacs.c
@@ -267,7 +267,7 @@
 	frameLeft >>= 2;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 		if (get_user(data, userPtr++))
@@ -298,7 +298,7 @@
 	frameLeft >>= 2;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 		if (get_user(data, userPtr++))
@@ -329,7 +329,7 @@
 	frameLeft >>= 2;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 		if (get_user(data, userPtr++))
@@ -359,7 +359,7 @@
 
 	frameLeft >>= 2;
 	userCount >>= (stereo? 2: 1);
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	if (!stereo) {
 		short *up = (short *) userPtr;
 		while (count > 0) {
@@ -390,7 +390,7 @@
 
 	frameLeft >>= 2;
 	userCount >>= (stereo? 2: 1);
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		int data;
 		if (get_user(data, up++))
@@ -648,7 +648,7 @@
 	frameLeft >>= 2;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 
@@ -681,7 +681,7 @@
 	frameLeft >>= 2;
 	if (stereo)
 		userCount >>= 1;
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		u_char data;
 
@@ -713,7 +713,7 @@
 
 	frameLeft >>= 2;
 	userCount >>= (stereo? 2: 1);
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	if (!stereo) {
 		short *up = (short *) userPtr;
 		while (count > 0) {
@@ -744,7 +744,7 @@
 
 	frameLeft >>= 2;
 	userCount >>= (stereo? 2: 1);
-	used = count = min(unsigned long, userCount, frameLeft);
+	used = count = min_t(unsigned long, userCount, frameLeft);
 	while (count > 0) {
 		int data;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)