aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-07-14 17:29:34 -0400
committerJonathan Corbet <corbet@lwn.net>2008-07-14 17:29:34 -0400
commit2fceef397f9880b212a74c418290ce69e7ac00eb (patch)
treed9cc09ab992825ef7fede4a688103503e3caf655 /drivers/isdn/i4l
parentfeae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff)
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff)
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/isdn/i4l')
-rw-r--r--drivers/isdn/i4l/isdn_common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 5158c606ff5b..7188c59a76ff 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1978,8 +1978,10 @@ isdn_writebuf_stub(int drvidx, int chan, const u_char __user * buf, int len)
1978 if (!skb) 1978 if (!skb)
1979 return -ENOMEM; 1979 return -ENOMEM;
1980 skb_reserve(skb, hl); 1980 skb_reserve(skb, hl);
1981 if (copy_from_user(skb_put(skb, len), buf, len)) 1981 if (copy_from_user(skb_put(skb, len), buf, len)) {
1982 dev_kfree_skb(skb);
1982 return -EFAULT; 1983 return -EFAULT;
1984 }
1983 ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, 1, skb); 1985 ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, 1, skb);
1984 if (ret <= 0) 1986 if (ret <= 0)
1985 dev_kfree_skb(skb); 1987 dev_kfree_skb(skb);