patch-2.4.10 linux/drivers/scsi/eata_pio.c

• Lines: 18
• Date: Mon Sep 10 08:06:32 2001
• Orig file: v2.4.9/linux/drivers/scsi/eata_pio.c
• Orig date: Mon Aug 27 12:41:44 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/scsi/eata_pio.c linux/drivers/scsi/eata_pio.c
@@ -161,7 +161,7 @@
 			    IncStat(&cmd->SCp,1);
 			    odd=FALSE;
 			}
-			x=min(unsigned int,z,cmd->SCp.this_residual/2);
+			x=min_t(unsigned int,z,cmd->SCp.this_residual/2);
 			insw(base+HA_RDATA,cmd->SCp.ptr,x);
 			z-=x; 
 			IncStat(&cmd->SCp,2*x);
@@ -191,7 +191,7 @@
 			    z--; 
 			    odd=FALSE; 
 			}
-			x=min(unsigned int,z,cmd->SCp.this_residual/2);
+			x=min_t(unsigned int,z,cmd->SCp.this_residual/2);
 			outsw(base+HA_RDATA,cmd->SCp.ptr,x);
 			z-=x; 
 			IncStat(&cmd->SCp,2*x);