From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: linux-kernel@vger.kernel.org, torvalds@transmeta.com
Subject: PATCH: fix proc handling in sis, siimageand slc90e66
Date: Fri, 21 Mar 2003 19:36:12 GMT [thread overview]
Message-ID: <200303211936.h2LJaCK7025824@hraefn.swansea.linux.org.uk> (raw)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/ide/pci/siimage.c linux-2.5.65-ac2/drivers/ide/pci/siimage.c
--- linux-2.5.65/drivers/ide/pci/siimage.c 2003-03-03 19:20:09.000000000 +0000
+++ linux-2.5.65-ac2/drivers/ide/pci/siimage.c 2003-03-06 23:35:51.000000000 +0000
@@ -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) */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/ide/pci/sis5513.c linux-2.5.65-ac2/drivers/ide/pci/sis5513.c
--- linux-2.5.65/drivers/ide/pci/sis5513.c 2003-03-03 19:20:09.000000000 +0000
+++ linux-2.5.65-ac2/drivers/ide/pci/sis5513.c 2003-03-06 23:35:34.000000000 +0000
@@ -424,6 +424,7 @@
static int sis_get_info (char *buffer, char **addr, off_t offset, int count)
{
char *p = buffer;
+ int len;
u8 reg;
u16 reg2, reg3;
@@ -494,7 +495,10 @@
p = get_masters_info(p);
p = get_slaves_info(p);
- return p-buffer;
+ len = (p - buffer) - offset;
+ *addr = buffer + offset;
+
+ return len > count ? count : len;
}
#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/ide/pci/slc90e66.c linux-2.5.65-ac2/drivers/ide/pci/slc90e66.c
--- linux-2.5.65/drivers/ide/pci/slc90e66.c 2003-03-03 19:20:09.000000000 +0000
+++ linux-2.5.65-ac2/drivers/ide/pci/slc90e66.c 2003-03-06 23:34:56.000000000 +0000
@@ -34,8 +34,9 @@
static int slc90e66_get_info (char *buffer, char **addr, off_t offset, int count)
{
char *p = buffer;
+ int len;
unsigned long bibma = pci_resource_start(bmide_dev, 4);
- u16 reg40 = 0, psitre = 0, reg42 = 0, ssitre = 0;
+ u16 reg40 = 0, psitre = 0, reg42 = 0, ssitre = 0;
u8 c0 = 0, c1 = 0;
u8 reg44 = 0, reg47 = 0, reg48 = 0, reg4a = 0, reg4b = 0;
@@ -110,7 +111,11 @@
* FIXME.... Add configuration junk data....blah blah......
*/
- 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_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) */
next reply other threads:[~2003-03-21 18:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-21 19:36 Alan Cox [this message]
2003-03-22 7:49 ` PATCH: fix proc handling in sis, siimageand slc90e66 Christoph Hellwig
2003-03-22 15:03 ` Alan Cox
2003-03-22 14:15 ` Christoph Hellwig
2003-03-22 17:34 ` Randy.Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200303211936.h2LJaCK7025824@hraefn.swansea.linux.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).