Skip to contentSkip to conversation

2.5.62: /proc/ide/pdcnew returns incomplete data [8/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/pdcnew returns incomplete data [8/17]

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

drivers/ide/pci/pdc202xx_new.c +6 -2
@@ -77,13 +77,17 @@
 static int pdcnew_get_info (char *buffer, char **addr, off_t offset, int count)
 {
 	char *p = buffer;
-	int i;
+	int i, len;
 
 	for (i = 0; i < n_pdc202_devs; i++) {
 		struct pci_dev *dev	= pdc202_devs[i];
 		p = pdcnew_info(buffer, dev);
 	}
-	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_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS) */