git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/azt3328' into for-linus
[pandora-kernel.git]
/
drivers
/
isdn
/
gigaset
/
isocdata.c
diff --git
a/drivers/isdn/gigaset/isocdata.c
b/drivers/isdn/gigaset/isocdata.c
index
29808c4
..
bed38fc
100644
(file)
--- a/
drivers/isdn/gigaset/isocdata.c
+++ b/
drivers/isdn/gigaset/isocdata.c
@@
-174,12
+174,6
@@
int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
pr_err("invalid size %d\n", size);
return -EINVAL;
}
pr_err("invalid size %d\n", size);
return -EINVAL;
}
- src = iwb->read;
- if (unlikely(limit >= BAS_OUTBUFSIZE + BAS_OUTBUFPAD ||
- (read < src && limit >= src))) {
- pr_err("isoc write buffer frame reservation violated\n");
- return -EFAULT;
- }
#endif
if (read < write) {
#endif
if (read < write) {
@@
-246,6
+240,10
@@
static inline void dump_bytes(enum debuglevel level, const char *tag,
unsigned char c;
static char dbgline[3 * 32 + 1];
int i = 0;
unsigned char c;
static char dbgline[3 * 32 + 1];
int i = 0;
+
+ if (!(gigaset_debuglevel & level))
+ return;
+
while (count-- > 0) {
if (i > sizeof(dbgline) - 4) {
dbgline[i] = '\0';
while (count-- > 0) {
if (i > sizeof(dbgline) - 4) {
dbgline[i] = '\0';