A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 04:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: core: Add compat ioctl support for listen driver"

Browse source
This commit is contained in:
qctecmdr 2020-01-13 12:50:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 0c7d45c665
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sound/pcm.h
View file

@ -56,7 +56,7 @@ struct snd_pcm_ops {
unsigned int cmd, void *arg);
#ifdef CONFIG_AUDIO_QGKI
int (*compat_ioctl)(struct snd_pcm_substream *substream,
unsigned int cmd, void *arg);
unsigned int cmd, void __user *arg);
#endif
int (*hw_params)(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params);

12
sound/core/pcm_compat.c
View file

@ -654,6 +654,15 @@ static int snd_compressed_ioctl32(struct snd_pcm_substream *substream,
pr_debug("%s called with cmd = %d\n", __func__, cmd);
return err;
}
static int snd_pcm_ioctl32_compat(struct snd_pcm_substream *substream,
unsigned int cmd, void __user *arg)
{
if (_IOC_TYPE(cmd) == 'C' || _IOC_TYPE(cmd) == 'U')
return snd_compressed_ioctl32(substream, cmd, arg);
return 0;
}
#endif
static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
@ -735,8 +744,7 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l
#endif /* CONFIG_X86_X32 */
#ifdef CONFIG_AUDIO_QGKI
default:
if (_IOC_TYPE(cmd) == 'C')
return snd_compressed_ioctl32(substream, cmd, argp);
return snd_pcm_ioctl32_compat(substream, cmd, argp);
#endif
}