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 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
[pandora-kernel.git]
/
drivers
/
isdn
/
gigaset
/
asyncdata.c
diff --git
a/drivers/isdn/gigaset/asyncdata.c
b/drivers/isdn/gigaset/asyncdata.c
index
88e958f
..
c2bd97d
100644
(file)
--- a/
drivers/isdn/gigaset/asyncdata.c
+++ b/
drivers/isdn/gigaset/asyncdata.c
@@
-350,8
+350,8
@@
void gigaset_m10x_input(struct inbuf_t *inbuf)
unsigned char *src, c;
int procbytes;
unsigned char *src, c;
int procbytes;
- head =
atomic_read(&inbuf->head)
;
- tail =
atomic_read(&inbuf->tail)
;
+ head =
inbuf->head
;
+ tail =
inbuf->tail
;
gig_dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
if (head != tail) {
gig_dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);
if (head != tail) {
@@
-361,7
+361,7
@@
void gigaset_m10x_input(struct inbuf_t *inbuf)
gig_dbg(DEBUG_INTR, "processing %u bytes", numbytes);
while (numbytes) {
gig_dbg(DEBUG_INTR, "processing %u bytes", numbytes);
while (numbytes) {
- if (
atomic_read(&cs->mstate)
== MS_LOCKED) {
+ if (
cs->mstate
== MS_LOCKED) {
procbytes = lock_loop(src, numbytes, inbuf);
src += procbytes;
numbytes -= procbytes;
procbytes = lock_loop(src, numbytes, inbuf);
src += procbytes;
numbytes -= procbytes;
@@
-436,9
+436,10
@@
nextbyte:
}
gig_dbg(DEBUG_INTR, "setting head to %u", head);
}
gig_dbg(DEBUG_INTR, "setting head to %u", head);
-
atomic_set(&inbuf->head, head)
;
+
inbuf->head = head
;
}
}
}
}
+EXPORT_SYMBOL_GPL(gigaset_m10x_input);
/* == data output ========================================================== */
/* == data output ========================================================== */
@@
-574,7
+575,8
@@
int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb)
else
skb = iraw_encode(skb, HW_HDR_LEN, 0);
if (!skb) {
else
skb = iraw_encode(skb, HW_HDR_LEN, 0);
if (!skb) {
- err("unable to allocate memory for encoding!\n");
+ dev_err(bcs->cs->dev,
+ "unable to allocate memory for encoding!\n");
return -ENOMEM;
}
return -ENOMEM;
}
@@
-586,3
+588,4
@@
int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb)
return len; /* ok so far */
}
return len; /* ok so far */
}
+EXPORT_SYMBOL_GPL(gigaset_m10x_send_skb);