summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-01-09 08:51:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-24 09:29:27 +0200
commit422cc8083759b4a1a5e5f4c4a27246a7d9aa67fd (patch)
tree90b6cfe80013d8d0dd34bba14ffedc8568d01782
parentad93d1325f53c6103fc323d913cf6ebcb57db3d3 (diff)
downloadlinux-stable-422cc8083759b4a1a5e5f4c4a27246a7d9aa67fd.tar.gz
linux-stable-422cc8083759b4a1a5e5f4c4a27246a7d9aa67fd.tar.bz2
linux-stable-422cc8083759b4a1a5e5f4c4a27246a7d9aa67fd.zip
ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
commit c64ed5dd9feba193c76eb460b451225ac2a0d87b upstream. 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/core/oss/pcm_oss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index fb3431a160d2..d884e57addc0 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -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);