Date: Sun, 23 Feb 2003 00:46:42 +0200
From: Faik Uygur <faikuygur@ttnet.net.tr>
To: vojtech@suse.cz
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] 2.5.62: /proc/ide/amd74xx returns incomplete data [3/17]
Message-ID: <20030222224642.GB2996@ttnet.net.tr>
Mail-Followup-To: vojtech@suse.cz, linux-kernel@vger.kernel.org
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-9
Content-Disposition: inline
User-Agent: Mutt/1.4i
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1167
Lines: 35

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

--- linux-2.5.62-vanilla/drivers/ide/pci/amd74xx.c	Sat Feb 22 23:01:04 2003
+++ linux-2.5.62/drivers/ide/pci/amd74xx.c	Sat Feb 22 23:19:56 2003
@@ -98,6 +98,7 @@
 	unsigned int v, u, i;
 	unsigned short c, w;
 	unsigned char t;
+	int len;
 	char *p = buffer;
 
 	amd_print("----------AMD BusMastering IDE Configuration----------------");
@@ -167,7 +168,11 @@
 	amd_print_drive("Cycle Time:    ", "%8dns", cycle[i]);
 	amd_print_drive("Transfer Rate: ", "%4d.%dMB/s", speed[i] / 1000, speed[i] / 100 % 10);
 
-	return p - buffer;	/* hoping it is less than 4K... */
+	/* hoping p - buffer is less than 4K... */
+	len = (p - buffer) - offset;
+	*addr = buffer + offset;
+	
+	return len > count ? count : len;
 }
 
 #endif


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