git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ca0106-resume' into topic/ca0106
[sfrench/cifs-2.6.git]
/
drivers
/
parport
/
parport_serial.c
diff --git
a/drivers/parport/parport_serial.c
b/drivers/parport/parport_serial.c
index e2e95b36a603e227be8d0d6b03b30996c9f00c6f..101ed49a2d15609937acbcf964274ed3f12d8360 100644
(file)
--- a/
drivers/parport/parport_serial.c
+++ b/
drivers/parport/parport_serial.c
@@
-70,6
+70,8
@@
static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc
* parallel ports and <S> is the number of serial ports.
*/
card->numports = (dev->subsystem_device & 0xf0) >> 4;
+ if (card->numports > ARRAY_SIZE(card->addr))
+ card->numports = ARRAY_SIZE(card->addr);
return 0;
}