X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fisdn%2Ftpam%2Ftpam_commands.c;h=02c199594c2e41c424b4080936ee10a84e2cb56f;hb=2cf7311f007833d5818fc9241c09a372c0325a4a;hp=9cf6ef14fb1db4cb6d460226f85698313c3977d0;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/drivers/isdn/tpam/tpam_commands.c b/drivers/isdn/tpam/tpam_commands.c index 9cf6ef14f..02c199594 100644 --- a/drivers/isdn/tpam/tpam_commands.c +++ b/drivers/isdn/tpam/tpam_commands.c @@ -120,7 +120,7 @@ static int tpam_command_ioctl_dspload(tpam_card *card, u32 arg) { dprintk("TurboPAM(tpam_command_ioctl_dspload): card=%d\n", card->id); /* get the IOCTL parameter from userspace */ - if (copy_from_user(&tdl, (void __user *)arg, sizeof(tpam_dsp_ioctl))) + if (copy_from_user(&tdl, (void *)arg, sizeof(tpam_dsp_ioctl))) return -EFAULT; /* if the board's firmware was started, protect against writes @@ -131,7 +131,7 @@ static int tpam_command_ioctl_dspload(tpam_card *card, u32 arg) { /* write the data in the board's memory */ return copy_from_user_to_pam(card, (void *)tdl.address, - (void __user *)arg + sizeof(tpam_dsp_ioctl), + (void *)arg + sizeof(tpam_dsp_ioctl), tdl.data_len); } @@ -150,7 +150,7 @@ static int tpam_command_ioctl_dspsave(tpam_card *card, u32 arg) { dprintk("TurboPAM(tpam_command_ioctl_dspsave): card=%d\n", card->id); /* get the IOCTL parameter from userspace */ - if (copy_from_user(&tdl, (void __user *)arg, sizeof(tpam_dsp_ioctl))) + if (copy_from_user(&tdl, (void *)arg, sizeof(tpam_dsp_ioctl))) return -EFAULT; /* protect against read from unallowed memory areas */ @@ -158,7 +158,7 @@ static int tpam_command_ioctl_dspsave(tpam_card *card, u32 arg) { return -EPERM; /* read the data from the board's memory */ - return copy_from_pam_to_user(card, (void __user *)arg + sizeof(tpam_dsp_ioctl), + return copy_from_pam_to_user(card, (void *)arg + sizeof(tpam_dsp_ioctl), (void *)tdl.address, tdl.data_len); }