X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fisdn%2Fsc%2Fcommand.c;h=b2c4eac7cef536ad42403837aedac5a4d3cd8a74;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=e37879a9acb557baf40a2ae5b8353f3421f7db06;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c
index e37879a9a..b2c4eac7c 100644
--- 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));
-		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);
@@ -215,7 +215,7 @@ int startproc(int card)
        	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;