summaryrefslogtreecommitdiff
path: root/drivers/isdn/mISDN
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-08-03 10:20:07 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-08-03 10:20:07 +1000
commit049b2573bea51f1c6498a7991b5b0237b2420bca (patch)
tree0784b8b20802be579a39ca3b0c1c80380f9f76bf /drivers/isdn/mISDN
parentcd4b0ccf3bb7c3024086b730e9b899f4f3fcb127 (diff)
parent63097b3ad85788a64c75091bff351ecc850761b2 (diff)
Merge commit 'net-current/master'
Diffstat (limited to 'drivers/isdn/mISDN')
-rw-r--r--drivers/isdn/mISDN/l1oip_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index c3b661a666cb..7e5f30dbc0a0 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1480,7 +1480,7 @@ l1oip_init(void)
return -ENOMEM;
l1oip_cnt = 0;
- while (type[l1oip_cnt] && l1oip_cnt < MAX_CARDS) {
+ while (l1oip_cnt < MAX_CARDS && type[l1oip_cnt]) {
switch (type[l1oip_cnt] & 0xff) {
case 1:
pri = 0;