From edf8d7c3367ec55905a8fce182c5cad16cf27874 Mon Sep 17 00:00:00 2001 From: Gopikrishnaiah Anand Date: Fri, 30 May 2014 11:29:56 -0700 Subject: [PATCH] ASoC: pcm: Add support for compat mode When kernel is compiled for 64 bit and userspace client is in 32 bit mode compat ioctl path will be taken.If platform driver supports compat mode asoc framework should call compat function pointers. Change adds support in asoc framework to support compat mode. Change-Id: I4929bc89c2ad467cdc83f5a00fe9d38e425c3ca2 Signed-off-by: Gopikrishnaiah Anand --- sound/soc/soc-pcm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8e645bbec656..b8013d4d218f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2217,6 +2217,19 @@ out: return ret; } +static int soc_pcm_compat_ioctl(struct snd_pcm_substream *substream, + unsigned int cmd, void *arg) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_platform *platform = rtd->platform; + + if (platform->driver->ops->compat_ioctl) + return platform->driver->ops->compat_ioctl(substream, + cmd, arg); + pr_debug("%s: compat mode not supported\n", __func__); + return -ENOIOCTLCMD; +} + static int soc_pcm_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg) { @@ -2674,6 +2687,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) rtd->ops.close = dpcm_fe_dai_close; rtd->ops.pointer = soc_pcm_pointer; rtd->ops.ioctl = soc_pcm_ioctl; + rtd->ops.compat_ioctl = soc_pcm_compat_ioctl; } else { rtd->ops.open = soc_pcm_open; rtd->ops.hw_params = soc_pcm_hw_params; @@ -2683,6 +2697,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) rtd->ops.close = soc_pcm_close; rtd->ops.pointer = soc_pcm_pointer; rtd->ops.ioctl = soc_pcm_ioctl; + rtd->ops.ioctl = soc_pcm_compat_ioctl; } if (platform->driver->ops) {