From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77E4BC5CFFE for ; Tue, 11 Dec 2018 16:03:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 349B32084E for ; Tue, 11 Dec 2018 16:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544544221; bh=VVU9uGonOruPa9XNjDB9rbIBQxtRAr4twNe1++GhtSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oBiIoJQd0QZtdMri5cdbW0TKS6SpKAE9vp8Z69g7dKfHWc4X4DPLEEo9HtQnfowoe Bi3ZYiHFsTnTfZm/eZ7Y+wUxdTrb5wKUPuhg3ECl0J4SxlpJqlZ0RUlFQPuh5scSO6 OZQtJvn4JXkRdRmaw02XlCn7ZXYR87YxOOb2J9Lg= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 349B32084E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731189AbeLKQDk (ORCPT ); Tue, 11 Dec 2018 11:03:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:45344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730207AbeLKP4e (ORCPT ); Tue, 11 Dec 2018 10:56:34 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A90F2086D; Tue, 11 Dec 2018 15:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543793; bh=VVU9uGonOruPa9XNjDB9rbIBQxtRAr4twNe1++GhtSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VAOhKaB6ZOtwWQk286ugDCn+96h5lLO6KSKt+8Zwsa52rb+SkNjGpuD2ls7XHebwa dZF5W3OPHjuY20mYjHXCO1EUWVLoxofy9L/ijS8LhA5td0Er/M+0VhB4gbFQ9VFPZ+ uviCn3dSlL98HDAhgZab1/axMxdVmX90amqVFcR0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.19 065/118] ALSA: pcm: Fix interval evaluation with openmin/max Date: Tue, 11 Dec 2018 16:41:24 +0100 Message-Id: <20181211151646.863817265@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151644.216668863@linuxfoundation.org> References: <20181211151644.216668863@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 5363857b916c1f48027e9b96ee8be8376bf20811 upstream. As addressed in alsa-lib (commit b420056604f0), we need to fix the case where the evaluation of PCM interval "(x x+1]" leading to -EINVAL. After applying rules, such an interval may be translated as "(x x+1)". Fixes: ff2d6acdf6f1 ("ALSA: pcm: Fix snd_interval_refine first/last with open min/max") Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- include/sound/pcm_params.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/include/sound/pcm_params.h +++ b/include/sound/pcm_params.h @@ -254,11 +254,13 @@ static inline int snd_interval_empty(con static inline int snd_interval_single(const struct snd_interval *i) { return (i->min == i->max || - (i->min + 1 == i->max && i->openmax)); + (i->min + 1 == i->max && (i->openmin || i->openmax))); } static inline int snd_interval_value(const struct snd_interval *i) { + if (i->openmin && !i->openmax) + return i->max; return i->min; }