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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 88614C5DF60 for ; Fri, 8 Nov 2019 19:05:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5463B2087E for ; Fri, 8 Nov 2019 19:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239910; bh=LZ1uuoVZmGLcMHbaav7oEKhJaVPSZG6TswowuEgtj50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C14251D7jM9w/IkO3CYUOHIiK3gUZ7ymKMBUGi5EX8ahQrJ+3vOA7YRtBghIOAIrY RCC2uekyYFWS5r1zkBETW+gQ+wEJL1u0enArdVgmQAj5IVciNacNwgQKxKFb4F/wih rHoAPg8GAmg1CXRdNUjurhj8VI4DGHXP26XB7WOo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732352AbfKHTFJ (ORCPT ); Fri, 8 Nov 2019 14:05:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:35170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391102AbfKHTFE (ORCPT ); Fri, 8 Nov 2019 14:05:04 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 54A272067B; Fri, 8 Nov 2019 19:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239903; bh=LZ1uuoVZmGLcMHbaav7oEKhJaVPSZG6TswowuEgtj50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QcEDUuafDSLi2chFF7SfArJg5PFYBLfJ5QBu5HyS4xMlx5eHfEmCIdLH6p5v8Bmxe 7ZOT0UVRuhF2b0im3ienuo6CPCyAh6y5FVj5a4vBb40Esm8gZa4QXsu5aCgSeQEHHp /FT7Q5vni0ZjNiO4CyzcBR1ab5gO+kUB8yINZ2gA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stuart Henderson , Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 5.3 021/140] ASoC: wm_adsp: Dont generate kcontrols without READ flags Date: Fri, 8 Nov 2019 19:49:09 +0100 Message-Id: <20191108174904.166184449@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Stuart Henderson [ Upstream commit 3ae7359c0e39f42a96284d6798fc669acff38140 ] User space always expects to be able to read ALSA controls, so ensure no kcontrols are generated without an appropriate READ flag. In the case of a read of such a control zeros will be returned. Signed-off-by: Stuart Henderson Signed-off-by: Charles Keepax Link: https://lore.kernel.org/r/20191002084240.21589-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm_adsp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index f5fbadc5e7e25..914fb3be5feae 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1259,8 +1259,7 @@ static unsigned int wmfw_convert_flags(unsigned int in, unsigned int len) } if (in) { - if (in & WMFW_CTL_FLAG_READABLE) - out |= rd; + out |= rd; if (in & WMFW_CTL_FLAG_WRITEABLE) out |= wr; if (in & WMFW_CTL_FLAG_VOLATILE) -- 2.20.1