2003-02-22 22:42:12

by Faik Uygur

[permalink] [raw]
Subject: [PATCH] 2.5.62: /proc/ide/cmd64x returns incomplete data [4/17]

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

--- linux-2.5.62-vanilla/drivers/ide/pci/cmd64x.c Tue Dec 24 07:21:11 2002
+++ linux-2.5.62/drivers/ide/pci/cmd64x.c Sat Feb 22 23:24:19 2003
@@ -146,14 +146,18 @@
static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count)
{
char *p = buffer;
- int i;
+ int i, len;

p += sprintf(p, "\n");
for (i = 0; i < n_cmd_devs; i++) {
struct pci_dev *dev = cmd_devs[i];
p = print_cmd64x_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_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */