]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
authorTakashi Iwai <tiwai@suse.de>
Tue, 9 Jan 2018 07:51:02 +0000 (08:51 +0100)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:34 +0000 (21:36 -0400)
[ Upstream commit c64ed5dd9feba193c76eb460b451225ac2a0d87b ]

Fix the last standing EINTR in the whole subsystem.  Use more correct
ERESTARTSYS for pending signals.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
sound/core/oss/pcm_oss.c

index 001f4526be8d94e375155842a7f6b808335d0406..fa7367f4d28c19459946ee434abf4495c10d099c 100644 (file)
@@ -852,7 +852,7 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream,
                if (!(mutex_trylock(&runtime->oss.params_lock)))
                        return -EAGAIN;
        } else if (mutex_lock_interruptible(&runtime->oss.params_lock))
-               return -EINTR;
+               return -ERESTARTSYS;
        sw_params = kzalloc(sizeof(*sw_params), GFP_KERNEL);
        params = kmalloc(sizeof(*params), GFP_KERNEL);
        sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);