2003-02-22 23:10:52

by Faik Uygur

[permalink] [raw]
Subject: [PATCH] 2.5.62: /proc/ide/piix returns incomplete data [11/17]

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

--- linux-2.5.62-vanilla/drivers/ide/pci/piix.c Sat Feb 22 23:00:40 2003
+++ linux-2.5.62/drivers/ide/pci/piix.c Sat Feb 22 23:37:19 2003
@@ -130,7 +130,7 @@
static int piix_get_info (char *buffer, char **addr, off_t offset, int count)
{
char *p = buffer;
- int i;
+ int i, len;

for (i = 0; i < n_piix_devs; i++) {
struct pci_dev *dev = piix_devs[i];
@@ -256,7 +256,11 @@
* FIXME.... Add configuration junk data....blah blah......
*/
}
- 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_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) */