[PATCH] 2.5.62: /proc/ide/pdcadma returns incomplete data [10/17]

Faik Uygur (faikuygur@ttnet.net.tr)
Sun, 23 Feb 2003 01:16:22 +0200


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

--- linux-2.5.62-vanilla/drivers/ide/pci/pdcadma.c Sun Feb 23 00:08:33 2003
+++ linux-2.5.62/drivers/ide/pci/pdcadma.c Sat Feb 22 23:36:32 2003
@@ -39,7 +39,7 @@
static int pdcadma_get_info (char *buffer, char **addr, off_t offset, int count)
{
char *p = buffer;
- int i;
+ int i, len;

for (i = 0; i < n_pdc_devs; i++) {
struct pci_dev *dev = pdc_devs[i];
@@ -51,7 +51,11 @@
p += sprintf(p, "PIO\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_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS) */

-
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/