2.5.62: /proc/ide/hpt34x returns incomplete data [6/17]

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

Share & tools

Faik Uygur

author

2003-02-22 22:50 UTC #0 lore raw

PATCH 1/1 2.5.62: /proc/ide/hpt34x returns incomplete data [6/17]

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

drivers/ide/pci/hpt34x.c +6 -2

@@ -58,7 +58,7 @@
 static int hpt34x_get_info (char *buffer, char **addr, off_t offset, int count)
 {
 	char *p = buffer;
-	int i;
+	int i, len;
 
 	p += sprintf(p, "\n                             "
 			"HPT34X Chipset.\n");

@@ -96,7 +96,11 @@
 	}
 	p += sprintf(p, "\n");
 
-	return p-buffer;	/* => must be less than 4k! */
+	/* p - buffer must be less than 4k! */
+	len = (p - buffer) - offset;
+	*addr = buffer + offset;
+	
+	return len > count ? count : len;
 }
 #endif  /* defined(DISPLAY_HPT34X_TIMINGS) && defined(CONFIG_PROC_FS) */