Skip to contentSkip to conversation

2.5.62: /proc/ide/amd74xx returns incomplete data [3/17]

PATCH New Faik Uygur 1 participant 1 message Feb 22, 2003

lore
Share & tools
lore

Faik Uygur

author
#0 lore raw

PATCH 1/1 2.5.62: /proc/ide/amd74xx returns incomplete data [3/17]

This patch fixes the incomplete data return problem of /proc/ide/amd74xx. When the number of consecutive read bytes are smaller than the total data in amd74xx_get_info(), the second read() returns 0.

drivers/ide/pci/amd74xx.c +6 -1
@@ -98,6 +98,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 +168,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