diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/ide/pci/amd74xx.c linux-2.5.65-ac2/drivers/ide/pci/amd74xx.c
--- linux-2.5.65/drivers/ide/pci/amd74xx.c 2003-03-18 16:46:48.000000000 +0000
+++ linux-2.5.65-ac2/drivers/ide/pci/amd74xx.c 2003-03-06 23:38:01.000000000 +0000
@@ -98,6 +99,7 @@
unsigned int v, u, i;
unsigned short c, w;
unsigned char t;
+ int len;
char *p = buffer;
amd_print("----------AMD BusMastering IDE Configuration----------------");
@@ -167,7 +169,11 @@
amd_print_drive("Cycle Time: ", "%8dns", cycle[i]);
amd_print_drive("Transfer Rate: ", "%4d.%dMB/s", speed[i] / 1000, speed[i] / 100 % 10);
- return p - buffer; /* hoping it is less than 4K... */
+ /* hoping p - buffer is less than 4K... */
+ len = (p - buffer) - offset;
+ *addr = buffer + offset;
+
+ return len > count ? count : len;
}
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Mar 23 2003 - 22:00:37 EST