public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] 2.5.62: /proc/ide/svwks returns incomplete data [13/17]
@ 2003-02-22 23:29 Faik Uygur
  0 siblings, 0 replies; only message in thread
From: Faik Uygur @ 2003-02-22 23:29 UTC (permalink / raw)
  To: andre; +Cc: linux-kernel

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

--- linux-2.5.62-vanilla/drivers/ide/pci/serverworks.c	Sat Feb 22 23:00:40 2003
+++ linux-2.5.62/drivers/ide/pci/serverworks.c	Sat Feb 22 23:40:36 2003
@@ -54,7 +54,7 @@
 static int svwks_get_info (char *buffer, char **addr, off_t offset, int count)
 {
 	char *p = buffer;
-	int i;
+	int i, len;
 
 	p += sprintf(p, "\n                             "
 			"ServerWorks OSB4/CSB5/CSB6\n");
@@ -192,7 +192,11 @@
 	}
 	p += sprintf(p, "\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_SVWKS_TIMINGS) && defined(CONFIG_PROC_FS) */


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2003-02-22 23:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-02-22 23:29 [PATCH] 2.5.62: /proc/ide/svwks returns incomplete data [13/17] Faik Uygur

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox