Update of /cvsroot/linux-mips/linux/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv17983/drivers/scsi
Modified Files:
ncr53c8xx.c
Log Message:
Synced to 2.4.18
Index: ncr53c8xx.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/ncr53c8xx.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ncr53c8xx.c 2 Jan 2002 20:42:12 -0000 1.4
+++ ncr53c8xx.c 26 Feb 2002 19:03:29 -0000 1.5
@@ -8165,14 +8165,10 @@
segment = 1;
}
}
- else {
+ else if (use_sg <= MAX_SCATTER) {
struct scatterlist *scatter = (struct scatterlist *)cmd->buffer;
use_sg = map_scsi_sg_data(np, cmd);
- if (use_sg > MAX_SCATTER) {
- unmap_scsi_data(np, cmd);
- return -1;
- }
data = &data[MAX_SCATTER - use_sg];
while (segment < use_sg) {
@@ -8187,6 +8183,9 @@
#endif
++segment;
}
+ }
+ else {
+ return -1;
}
return segment;
|
