diff options
author | Cornelia Huck <cohuck@de.ibm.com> | 2005-06-21 20:16:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:07:32 -0400 |
commit | 5bdfcfcc0780f58b927a164dfd54d1e1b6767347 (patch) | |
tree | 468f1bfb38cfece7ec050655ec870c30adc3538a | |
parent | 60b2737de1b1ddfdb90f3ba622634eb49d6f3603 (diff) |
[PATCH] s390: cio max channels checks
Fix max channel check in cio_ignore display function.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/s390/cio/blacklist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 4a06c7d0e5e4..aac83ce6469c 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/s390/cio/blacklist.c | 2 | * drivers/s390/cio/blacklist.c |
3 | * S/390 common I/O routines -- blacklisting of specific devices | 3 | * S/390 common I/O routines -- blacklisting of specific devices |
4 | * $Revision: 1.33 $ | 4 | * $Revision: 1.34 $ |
5 | * | 5 | * |
6 | * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, | 6 | * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, |
7 | * IBM Corporation | 7 | * IBM Corporation |
@@ -289,7 +289,7 @@ static int cio_ignore_read (char *page, char **start, off_t off, | |||
289 | len = 0; | 289 | len = 0; |
290 | for (devno = off; /* abuse the page variable | 290 | for (devno = off; /* abuse the page variable |
291 | * as counter, see fs/proc/generic.c */ | 291 | * as counter, see fs/proc/generic.c */ |
292 | devno <= __MAX_SUBCHANNELS && len + entry_size < count; devno++) { | 292 | devno < __MAX_SUBCHANNELS && len + entry_size < count; devno++) { |
293 | if (!test_bit(devno, bl_dev)) | 293 | if (!test_bit(devno, bl_dev)) |
294 | continue; | 294 | continue; |
295 | len += sprintf(page + len, "0.0.%04lx", devno); | 295 | len += sprintf(page + len, "0.0.%04lx", devno); |
@@ -302,7 +302,7 @@ static int cio_ignore_read (char *page, char **start, off_t off, | |||
302 | len += sprintf(page + len, "\n"); | 302 | len += sprintf(page + len, "\n"); |
303 | } | 303 | } |
304 | 304 | ||
305 | if (devno <= __MAX_SUBCHANNELS) | 305 | if (devno < __MAX_SUBCHANNELS) |
306 | *eof = 1; | 306 | *eof = 1; |
307 | *start = (char *) (devno - off); /* number of checked entries */ | 307 | *start = (char *) (devno - off); /* number of checked entries */ |
308 | return len; | 308 | return len; |