Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c11530 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: core: Add compat ioctl support for listen driver" into msm-4.8

parents 57771a1e 9df94f73

sound/core/pcm_compat.c

+16 −0
Original line number Diff line number Diff line
@@ -673,6 +673,20 @@ 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_user_ioctl32(struct snd_pcm_substream *substream,

			  unsigned int cmd, void __user *arg)

{

	struct snd_pcm_runtime *runtime;

	int err = -ENOIOCTLCMD;



	if (PCM_RUNTIME_CHECK(substream))

		return -ENXIO;

	runtime = substream->runtime;

	if (substream->ops->compat_ioctl)

		err = substream->ops->compat_ioctl(substream, cmd, arg);

	return err;

}





static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)

{
@@ -756,6 +770,8 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l 
	default:

		if (_IOC_TYPE(cmd) == 'C')

			return snd_compressed_ioctl32(substream, cmd, argp);

		else if (_IOC_TYPE(cmd) == 'U')

			return snd_user_ioctl32(substream, cmd, argp);

	}



	return -ENOIOCTLCMD;