diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-12-20 16:34:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-20 16:45:10 +0100 |
| commit | d63e63d4210713ddc7eb1b2d2afc4a8d42ccf91e (patch) | |
| tree | 4c55b3ff63e8c43b48f06545972fec4715aa1398 /sound/pci/rme9652/hdsp.c | |
| parent | ALSA: emu10k1: Make uapi/emu10k1.h compilable again (diff) | |
| download | linux-dev-d63e63d4210713ddc7eb1b2d2afc4a8d42ccf91e.tar.xz linux-dev-d63e63d4210713ddc7eb1b2d2afc4a8d42ccf91e.zip | |
ALSA: hdsp: Make uapi/hdsp.h compilable again
Recently alsa-lib updated its content of sound/hdsp.h just by copying
the latest Linus kernel uapi/*.h, and this broke the build of
alsa-tools programs. We used to modify the headers so that they can
be built without asoundlib.h and linux kernel headers, and the
verbatim copy doesn't work as is.
This patch removes again the linux/types.h inclusion and drop __user
prefix that broke the build and adjusts the corresponding code.
Link: https://lore.kernel.org/r/20191220153415.2740-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 87e60dd13066..b4c42c4fa201 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -4817,7 +4817,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne "initializing firmware upload\n"); firmware = (struct hdsp_firmware __user *)argp; - if (get_user(firmware_data, &firmware->firmware_data)) + if (get_user(firmware_data, (__force void __user **)&firmware->firmware_data)) return -EFAULT; if (hdsp_check_for_iobox (hdsp)) |