diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 05:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 05:19:22 -0400 |
| commit | a35197a8be891072b3654dc7a2285573150dedee (patch) | |
| tree | f3829335b8a0cd40e2cdb94d7fefb54bf67977df /drivers/isdn/gigaset/isocdata.c | |
| parent | 6daad5c6c586bf07528ae5b39e801b204468f907 (diff) | |
| parent | 67a433ce278b98f47272726a22537fab7fd99de9 (diff) | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline
Diffstat (limited to 'drivers/isdn/gigaset/isocdata.c')
| -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 b171e75cb52e..29808c4fb1cb 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; |