diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-25 04:42:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 04:42:21 -0400 |
| commit | c649c0e31d5736a4b7c5c3454182091dda4bbe62 (patch) | |
| tree | 93da11bf4ea828611ab5277a7dbadf57724c2b1e /drivers/isdn | |
| parent | daebafed7fef54fcc73d2d01431122cfd578d1e0 (diff) | |
| parent | 4e2fd555199977c5994d1a4d2d3b8761b20ca4c7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/gigaset/isocdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c index 09202a5a344..db3a1e4cd48 100644 --- a/drivers/isdn/gigaset/isocdata.c +++ b/drivers/isdn/gigaset/isocdata.c | |||
| @@ -175,7 +175,7 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size) | |||
| 175 | return -EINVAL; | 175 | return -EINVAL; |
| 176 | } | 176 | } |
| 177 | src = iwb->read; | 177 | src = iwb->read; |
| 178 | if (unlikely(limit > BAS_OUTBUFSIZE + BAS_OUTBUFPAD || | 178 | if (unlikely(limit >= BAS_OUTBUFSIZE + BAS_OUTBUFPAD || |
| 179 | (read < src && limit >= src))) { | 179 | (read < src && limit >= src))) { |
| 180 | pr_err("isoc write buffer frame reservation violated\n"); | 180 | pr_err("isoc write buffer frame reservation violated\n"); |
| 181 | return -EFAULT; | 181 | return -EFAULT; |