|
@@ -6097,7 +6097,7 @@ static inline int copy_u32_le(void __user *dest, void __iomem *src)
|
|
}
|
|
}
|
|
|
|
|
|
static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
|
|
static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
|
|
- unsigned int cmd, unsigned long __user arg)
|
|
|
|
|
|
+ unsigned int cmd, unsigned long arg)
|
|
{
|
|
{
|
|
void __user *argp = (void __user *)arg;
|
|
void __user *argp = (void __user *)arg;
|
|
struct hdspm *hdspm = hw->private_data;
|
|
struct hdspm *hdspm = hw->private_data;
|
|
@@ -6222,7 +6222,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
|
|
info.line_out = hdspm_line_out(hdspm);
|
|
info.line_out = hdspm_line_out(hdspm);
|
|
info.passthru = 0;
|
|
info.passthru = 0;
|
|
spin_unlock_irq(&hdspm->lock);
|
|
spin_unlock_irq(&hdspm->lock);
|
|
- if (copy_to_user((void __user *) arg, &info, sizeof(info)))
|
|
|
|
|
|
+ if (copy_to_user(argp, &info, sizeof(info)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -6261,7 +6261,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
- if (copy_to_user((void __user *) arg, &status, sizeof(status)))
|
|
|
|
|
|
+ if (copy_to_user(argp, &status, sizeof(status)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
|
|
@@ -6280,13 +6280,13 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
|
|
if (hdspm->tco)
|
|
if (hdspm->tco)
|
|
hdspm_version.addons |= HDSPM_ADDON_TCO;
|
|
hdspm_version.addons |= HDSPM_ADDON_TCO;
|
|
|
|
|
|
- if (copy_to_user((void __user *) arg, &hdspm_version,
|
|
|
|
|
|
+ if (copy_to_user(argp, &hdspm_version,
|
|
sizeof(hdspm_version)))
|
|
sizeof(hdspm_version)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
break;
|
|
break;
|
|
|
|
|
|
case SNDRV_HDSPM_IOCTL_GET_MIXER:
|
|
case SNDRV_HDSPM_IOCTL_GET_MIXER:
|
|
- if (copy_from_user(&mixer, (void __user *)arg, sizeof(mixer)))
|
|
|
|
|
|
+ if (copy_from_user(&mixer, argp, sizeof(mixer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
if (copy_to_user((void __user *)mixer.mixer, hdspm->mixer,
|
|
if (copy_to_user((void __user *)mixer.mixer, hdspm->mixer,
|
|
sizeof(struct hdspm_mixer)))
|
|
sizeof(struct hdspm_mixer)))
|