git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
isdn
/
sc
/
command.c
diff --git
a/drivers/isdn/sc/command.c
b/drivers/isdn/sc/command.c
index
e37879a
..
b2c4eac
100644
(file)
--- a/
drivers/isdn/sc/command.c
+++ b/
drivers/isdn/sc/command.c
@@
-117,7
+117,7
@@
int command(isdn_ctrl *cmd)
scs_ioctl ioc;
memcpy(&cmdptr, cmd->parm.num, sizeof(unsigned long));
scs_ioctl ioc;
memcpy(&cmdptr, cmd->parm.num, sizeof(unsigned long));
- if (copy_from_user(&ioc, (scs_ioctl *)cmdptr,
+ if (copy_from_user(&ioc, (scs_ioctl
__user
*)cmdptr,
sizeof(scs_ioctl))) {
pr_debug("%s: Failed to verify user space 0x%x\n",
sc_adapter[card]->devicename, cmdptr);
sizeof(scs_ioctl))) {
pr_debug("%s: Failed to verify user space 0x%x\n",
sc_adapter[card]->devicename, cmdptr);
@@
-215,7
+215,7
@@
int startproc(int card)
status = sendmessage(card, CMPID,cmReqType2,
cmReqClass0,
cmReqStartProc,
status = sendmessage(card, CMPID,cmReqType2,
cmReqClass0,
cmReqStartProc,
- 0,0,
0
);
+ 0,0,
NULL
);
pr_debug("%s: Sent startProc\n", sc_adapter[card]->devicename);
return status;
pr_debug("%s: Sent startProc\n", sc_adapter[card]->devicename);
return status;