2.5.62: /proc/ide/pdcadma returns incomplete data [10/17]
PATCH 1/1 2.5.62: /proc/ide/pdcadma returns incomplete data [10/17]
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.
drivers/ide/pci/pdcadma.c +6 -2
@@ -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) */