projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 7e59c6a4 GKH |
1 | From c64ed5dd9feba193c76eb460b451225ac2a0d87b Mon Sep 17 00:00:00 2001 |
| 2 | From: Takashi Iwai <tiwai@suse.de> | |
| 3 | Date: Tue, 9 Jan 2018 08:51:02 +0100 | |
| 4 | Subject: ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation | |
| 5 | ||
| 6 | From: Takashi Iwai <tiwai@suse.de> | |
| 7 | ||
| 8 | commit c64ed5dd9feba193c76eb460b451225ac2a0d87b upstream. | |
| 9 | ||
| 10 | Fix the last standing EINTR in the whole subsystem. Use more correct | |
| 11 | ERESTARTSYS for pending signals. | |
| 12 | ||
| 13 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 15 | ||
| 16 | --- | |
| 17 | sound/core/oss/pcm_oss.c | 2 +- | |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 19 | ||
| 20 | --- a/sound/core/oss/pcm_oss.c | |
| 21 | +++ b/sound/core/oss/pcm_oss.c | |
| 22 | @@ -852,7 +852,7 @@ static int snd_pcm_oss_change_params(str | |
| 23 | if (!(mutex_trylock(&runtime->oss.params_lock))) | |
| 24 | return -EAGAIN; | |
| 25 | } else if (mutex_lock_interruptible(&runtime->oss.params_lock)) | |
| 26 | - return -EINTR; | |
| 27 | + return -ERESTARTSYS; | |
| 28 | sw_params = kzalloc(sizeof(*sw_params), GFP_KERNEL); | |
| 29 | params = kmalloc(sizeof(*params), GFP_KERNEL); | |
| 30 | sparams = kmalloc(sizeof(*sparams), GFP_KERNEL); |