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

From: Faik Uygur (faikuygur@ttnet.net.tr)
Date: Sat Feb 22 2003 - 18:52:10 EST


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

--- linux-2.5.62-vanilla/drivers/ide/pci/triflex.c Sun Feb 23 00:08:33 2003
+++ linux-2.5.62/drivers/ide/pci/triflex.c Sat Feb 22 23:52:14 2003
@@ -49,6 +49,7 @@
 static int triflex_get_info(char *buf, char **addr, off_t offset, int count)
 {
         char *p = buf;
+ int len;
 
         struct pci_dev *dev = triflex_dev;
         unsigned long bibma = pci_resource_start(dev, 4);
@@ -85,8 +86,11 @@
 
         p += sprintf(p, "DMA\n");
         p += sprintf(p, "PIO\n");
+
+ len = (p - buf) - offset;
+ *addr = buf + offset;
         
- return p-buf;
+ return len > count ? count : len;
 }
 
 static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)

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



This archive was generated by hypermail 2b29 : Sun Feb 23 2003 - 22:00:37 EST