diff options
Diffstat (limited to 'drivers/isdn/gigaset/isocdata.c')
-rw-r--r-- | drivers/isdn/gigaset/isocdata.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c index fbce5222d83c..b171e75cb52e 100644 --- a/drivers/isdn/gigaset/isocdata.c +++ b/drivers/isdn/gigaset/isocdata.c | |||
@@ -88,11 +88,9 @@ static inline int isowbuf_startwrite(struct isowbuf_t *iwb) | |||
88 | __func__); | 88 | __func__); |
89 | return 0; | 89 | return 0; |
90 | } | 90 | } |
91 | #ifdef CONFIG_GIGASET_DEBUG | ||
92 | gig_dbg(DEBUG_ISO, | 91 | gig_dbg(DEBUG_ISO, |
93 | "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d", | 92 | "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d", |
94 | __func__, iwb->data[iwb->write], iwb->wbits); | 93 | __func__, iwb->data[iwb->write], iwb->wbits); |
95 | #endif | ||
96 | return 1; | 94 | return 1; |
97 | } | 95 | } |
98 | 96 | ||
@@ -173,13 +171,13 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size) | |||
173 | __func__, read, write, limit); | 171 | __func__, read, write, limit); |
174 | #ifdef CONFIG_GIGASET_DEBUG | 172 | #ifdef CONFIG_GIGASET_DEBUG |
175 | if (unlikely(size < 0 || size > BAS_OUTBUFPAD)) { | 173 | if (unlikely(size < 0 || size > BAS_OUTBUFPAD)) { |
176 | err("invalid size %d", size); | 174 | pr_err("invalid size %d\n", size); |
177 | return -EINVAL; | 175 | return -EINVAL; |
178 | } | 176 | } |
179 | src = iwb->read; | 177 | src = iwb->read; |
180 | if (unlikely(limit > BAS_OUTBUFSIZE + BAS_OUTBUFPAD || | 178 | if (unlikely(limit > BAS_OUTBUFSIZE + BAS_OUTBUFPAD || |
181 | (read < src && limit >= src))) { | 179 | (read < src && limit >= src))) { |
182 | err("isoc write buffer frame reservation violated"); | 180 | pr_err("isoc write buffer frame reservation violated\n"); |
183 | return -EFAULT; | 181 | return -EFAULT; |
184 | } | 182 | } |
185 | #endif | 183 | #endif |