Messages in this thread Patch in this message | | | Date | Fri, 21 Mar 2003 19:34:30 GMT | From | Alan Cox <> | Subject | PATCH: fix proc handling in serverworks and sc1200 ide |
| |
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/ide/pci/sc1200.c linux-2.5.65-ac2/drivers/ide/pci/sc1200.c --- linux-2.5.65/drivers/ide/pci/sc1200.c 2003-03-03 19:20:09.000000000 +0000 +++ linux-2.5.65-ac2/drivers/ide/pci/sc1200.c 2003-03-06 23:36:26.000000000 +0000 @@ -87,6 +87,7 @@ { char *p = buffer; unsigned long bibma = pci_resource_start(bmide_dev, 4); + int len; u8 c0 = 0, c1 = 0; /* @@ -111,7 +112,10 @@ p += sprintf(p, "DMA\n"); p += sprintf(p, "PIO\n"); - return p-buffer; + len = (p - buffer) - offset; + *addr = buffer + offset; + + return len > count ? count : len; } #endif /* DISPLAY_SC1200_TIMINGS && CONFIG_PROC_FS */ diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/ide/pci/serverworks.c linux-2.5.65-ac2/drivers/ide/pci/serverworks.c --- linux-2.5.65/drivers/ide/pci/serverworks.c 2003-03-03 19:20:09.000000000 +0000 +++ linux-2.5.65-ac2/drivers/ide/pci/serverworks.c 2003-03-06 23:36:07.000000000 +0000 @@ -57,7 +57,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"); @@ -195,7 +195,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) */ - 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/
| |