Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / net / irda / ircomm / ircomm_tty.c

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index f6061c4bb0a8056013141926ff114da710b8fa8c..ec157c3419b5165f7b2a51dd7b763ad2a413bc57 100644 (file)
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -690,7 +690,7 @@ static int ircomm_tty_write(struct tty_struct *tty,
                }
 
                /* Copy data */
-               memcpy(skb_put(skb,size), buf + len, size);
+               skb_put_data(skb, buf + len, size);
 
                count -= size;
                len += size;