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 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[pandora-kernel.git]
/
drivers
/
isdn
/
hardware
/
avm
/
b1dma.c
diff --git
a/drivers/isdn/hardware/avm/b1dma.c
b/drivers/isdn/hardware/avm/b1dma.c
index
1e2d38e
..
428872b
100644
(file)
--- a/
drivers/isdn/hardware/avm/b1dma.c
+++ b/
drivers/isdn/hardware/avm/b1dma.c
@@
-404,7
+404,8
@@
static void b1dma_dispatch_tx(avmcard *card)
printk(KERN_DEBUG "tx: put 0x%x len=%d\n",
skb->data[2], txlen);
#endif
- memcpy(dma->sendbuf.dmabuf, skb->data+2, skb->len-2);
+ skb_copy_from_linear_data_offset(skb, 2, dma->sendbuf.dmabuf,
+ skb->len - 2);
}
txlen = (txlen + 3) & ~3;