diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-01-09 10:51:02 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-10-21 10:44:59 +0300 |
| commit | 8f762a29c254d24cf4251200d51bda7acde654e5 (patch) | |
| tree | 279dbaacfd3b4969c44b97e7255823213b416115 /sound/core | |
| parent | 6e0e1d42acc4cdf87a4b3ae67dd6a741bccc6919 (diff) | |
| download | linux-8f762a29c254d24cf4251200d51bda7acde654e5.tar.xz | |
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index c64b13761aca..0f6b3ba67bb7 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 = kmalloc(sizeof(*sw_params), GFP_KERNEL); params = kmalloc(sizeof(*params), GFP_KERNEL); sparams = kmalloc(sizeof(*sparams), GFP_KERNEL); |