2.5.62: /proc/ide/siimage returns incomplete data [14/17]
PATCH 1/1 2.5.62: /proc/ide/siimage returns incomplete data [14/17]
This patch fixes the incomplete data return problem of /proc/ide/siimage. When the number of consecutive read bytes are smaller than the total data in siimage_get_info(), the second read() returns 0.
drivers/ide/pci/siimage.c +6 -1
@@ -55,6 +55,7 @@static int siimage_get_info (char *buffer,char **addr,off_t offset,int count) {char *p = buffer; +int len;u16 i; p +=sprintf (p,"\n" );
@@ -62,7 +63,11 @@struct pci_dev *dev = siimage_devs[i]; p = print_siimage_get_info(p, dev, i); } -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_SIIMAGE_TIMINGS) && defined(CONFIG_PROC_FS) */