diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 21:44:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 21:44:59 -0500 |
| commit | 15b0669072127f282896b3bef2e9df4ec5d7264f (patch) | |
| tree | 8480e09bbc7c26cd5c9ef048b734664cb6fe76be /drivers/isdn | |
| parent | c155b914651753f843445d2f860bc00137df5d52 (diff) | |
| parent | 3537d54c0c39de5738bba8d19f128478b0b96a71 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (44 commits)
qlge: Fix sparse warnings for tx ring indexes.
qlge: Fix sparse warning regarding rx buffer queues.
qlge: Fix sparse endian warning in ql_hw_csum_setup().
qlge: Fix sparse endian warning for inbound packet control block flags.
qlge: Fix sparse warnings for byte swapping in qlge_ethool.c
myri10ge: print MAC and serial number on probe failure
pkt_sched: cls_u32: Fix locking in u32_change()
iucv: fix cpu hotplug
af_iucv: Free iucv path/socket in path_pending callback
af_iucv: avoid left over IUCV connections from failing connects
af_iucv: New error return codes for connect()
net/ehea: bitops work on unsigned longs
Revert "net: Fix for initial link state in 2.6.28"
tcp: Kill extraneous SPLICE_F_NONBLOCK checks.
tcp: don't mask EOF and socket errors on nonblocking splice receive
dccp: Integrate the TFRC library with DCCP
dccp: Clean up ccid.c after integration of CCID plugins
dccp: Lockless integration of CCID congestion-control plugins
qeth: get rid of extra argument after printk to dev_* conversion
qeth: No large send using EDDP for HiperSockets.
...
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/capi/capidrv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index d5b4cc357a3c..650120261abf 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c | |||
| @@ -1519,7 +1519,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep) | |||
| 1519 | int digit2 = 0; | 1519 | int digit2 = 0; |
| 1520 | if (!isdigit(*s)) return -3; | 1520 | if (!isdigit(*s)) return -3; |
| 1521 | while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; } | 1521 | while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; } |
| 1522 | if (digit1 <= 0 && digit1 > 30) return -4; | 1522 | if (digit1 <= 0 || digit1 > 30) return -4; |
| 1523 | if (*s == 0 || *s == ',' || *s == ' ') { | 1523 | if (*s == 0 || *s == ',' || *s == ' ') { |
| 1524 | bmask |= (1 << digit1); | 1524 | bmask |= (1 << digit1); |
| 1525 | digit1 = 0; | 1525 | digit1 = 0; |
| @@ -1530,7 +1530,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep) | |||
| 1530 | s++; | 1530 | s++; |
| 1531 | if (!isdigit(*s)) return -3; | 1531 | if (!isdigit(*s)) return -3; |
| 1532 | while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; } | 1532 | while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; } |
| 1533 | if (digit2 <= 0 && digit2 > 30) return -4; | 1533 | if (digit2 <= 0 || digit2 > 30) return -4; |
| 1534 | if (*s == 0 || *s == ',' || *s == ' ') { | 1534 | if (*s == 0 || *s == ',' || *s == ' ') { |
| 1535 | if (digit1 > digit2) | 1535 | if (digit1 > digit2) |
| 1536 | for (i = digit2; i <= digit1 ; i++) | 1536 | for (i = digit2; i <= digit1 ; i++) |