diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/isdn/mISDN/socket.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/isdn/mISDN/socket.c')
| -rw-r--r-- | drivers/isdn/mISDN/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 4ba4cc364c9e..e5a20f9542d1 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c | |||
| @@ -379,7 +379,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
| 379 | di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); | 379 | di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); |
| 380 | di.protocol = dev->D.protocol; | 380 | di.protocol = dev->D.protocol; |
| 381 | memcpy(di.channelmap, dev->channelmap, | 381 | memcpy(di.channelmap, dev->channelmap, |
| 382 | MISDN_CHMAP_SIZE * 4); | 382 | sizeof(di.channelmap)); |
| 383 | di.nrbchan = dev->nrbchan; | 383 | di.nrbchan = dev->nrbchan; |
| 384 | strcpy(di.name, dev->name); | 384 | strcpy(di.name, dev->name); |
| 385 | if (copy_to_user((void __user *)arg, &di, sizeof(di))) | 385 | if (copy_to_user((void __user *)arg, &di, sizeof(di))) |
| @@ -637,7 +637,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
| 637 | di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); | 637 | di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); |
| 638 | di.protocol = dev->D.protocol; | 638 | di.protocol = dev->D.protocol; |
| 639 | memcpy(di.channelmap, dev->channelmap, | 639 | memcpy(di.channelmap, dev->channelmap, |
| 640 | MISDN_CHMAP_SIZE * 4); | 640 | sizeof(di.channelmap)); |
| 641 | di.nrbchan = dev->nrbchan; | 641 | di.nrbchan = dev->nrbchan; |
| 642 | strcpy(di.name, dev->name); | 642 | strcpy(di.name, dev->name); |
| 643 | if (copy_to_user((void __user *)arg, &di, sizeof(di))) | 643 | if (copy_to_user((void __user *)arg, &di, sizeof(di))) |