From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48gadbalXx4B35ZetRzznXKw6oyDP+WOe4CuFha/mx2kQsM5svyjwyhS56ExmMtAps3bbIb ARC-Seal: i=1; a=rsa-sha256; t=1524406861; cv=none; d=google.com; s=arc-20160816; b=oPtqYgjYXkDml9zkFm5TiAbqKEpxToFqs3Vw/y0+5pRwj4ft9hbvGNRC7OXwxEnDt+ JQr4EhaaFhl/3zIhbsDojEjGGpLc/hxAkUsFzDGH8ODHWcNI/4WkKCCUlqGhCxDduQNt o45xAyGwC3XdINZ3e8q5T0akAhLazx2QQIyr6u/5GM4zsP5cI73EgKZTUU3mNOVhihnS Jws29Be61B1UVk0Sqzm8zxWAhQumJG7mUVCAd0it3t2A6bR6mhOTGobvBxbpTWLCJBi9 xtN91VYvo8IMsnr/sj3yClBAAXxPsmeL8fgOhAEMDOnBla3kASZEeMSnNAPWLbKlPrAF 4M6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=1VdJmTvK27YOgZZOMDS4+89iEcpn+AgQQY/9uqeLBL4=; b=v1cwKxwi9D4yqTntXjRcYNP8BOrar1bubLjNbwvZ5MA139J3qtxJz9r65ULGwKbyfM AK6UqNujFUzL6Q+/hMzByJG9W3oGd2gEOwFMxbxbmzqaewZE6SoSbLbnCa6QM3qIuUoI wAUeFKsuYWEdxb1dTsoLBnDS0jI5Fu/XQ9/XmclHMyIOnTcCj17B5umGa/pkc+InRZOM PBTGlGaWHM41s9HtiwRNIHuPwYs9gwLAs9DkSsQwaGYoheEOWoilIS1vCi+85tQQkiRb Sfunq7oLD9a2dFjdNIxmGW3F5uk4FxW9iHiJRE7o4KMnLL7oWEN2lI9+jyrZq++HTsMC 2LYg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 3.18 32/52] ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation Date: Sun, 22 Apr 2018 15:54:05 +0200 Message-Id: <20180422135316.925818616@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135315.254787616@linuxfoundation.org> References: <20180422135315.254787616@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598455655750027723?= X-GMAIL-MSGID: =?utf-8?q?1598456449702319822?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit c64ed5dd9feba193c76eb460b451225ac2a0d87b upstream. Fix the last standing EINTR in the whole subsystem. Use more correct ERESTARTSYS for pending signals. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/core/oss/pcm_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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(str 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);