Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp7150609ybi; Mon, 8 Jul 2019 15:39:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTG2s2UKZk1uJUov8R7odNLt2g6Eb8jmxDkVrRNePPXIJfbDIb/odpDZ4PJ9k4g/muVObY X-Received: by 2002:a17:90a:8591:: with SMTP id m17mr21692549pjn.100.1562625591231; Mon, 08 Jul 2019 15:39:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562625591; cv=none; d=google.com; s=arc-20160816; b=qLBI6r+1oLVQOu3IjMA3Er16wf54bTsg9IVe8dS81CIZdxd/JmPKkt0RtWyhsjGne7 qh83t+tXaQuADH5GcevdCQN1FsN4eUFfGyMGWTm4fl38ga5JiFzQFNiSgOzzIlHGAKjf tGxCIcnO2PtVs5y9QraQ6Eo31kp+dZmS6kyH7iqkK93DYByFYcF3uA4q/XMEn2skqp2r T6UGdEVGpm2iXzBatufTS3IFxGiAdxp7jgTdvE+kDeGal1xV5qhA2JJmZVCPTabgUzhz 2H3f9R9558DUJln6Ubp1wLBrgbi0XYgEjahNi1p6WxLzSePGktHVSZ6qjRXrDkvzOMB2 vz6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KHtfP2N54BBjv0N+0PpznqWT1lxI05ExQwzgFZbcABU=; b=K3Lu0vFApW+UbtT+i0x3GOrOyBRk8DtXeZxN3E0ws2FFiVwBoWZc9ZMZyIyWGuEPiJ zCWbF/qWHOVXJp252rIbCNAPgQS+Ehi2NktbEI2DXZhJ6IPQLa/BtBR5Dcc5WDe3JkCM rTGhCyStRAaCz5oAYbVsLe6k7haLwJGb7fEhK2fUjupyNyWmC+5nETFmZ4PP6lrcxrE0 38tcjEMnqw3SSdQTwPwOsxw0XonNjjKFlWxA+EtbFyXietDwFEN2C2Cj2qQb6BlckbyG 4D9xsTNgpqT8v8r2bFw/VOIGr+2BQiOr67B7catuMniWOKWc1KaCWTir0IwWj3tFx++2 Zn+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gci1XkfM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u190si21183652pgd.547.2019.07.08.15.39.35; Mon, 08 Jul 2019 15:39:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gci1XkfM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389907AbfGHPa5 (ORCPT + 99 others); Mon, 8 Jul 2019 11:30:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:60122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389880AbfGHPa4 (ORCPT ); Mon, 8 Jul 2019 11:30:56 -0400 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 C49B221537; Mon, 8 Jul 2019 15:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562599856; bh=tES8anvbIE6i8CteTv1DhyTdmObCNtpLBKg9b6C/sKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gci1XkfMS5UYJC7VT2UqkBiizJP3yrsIvdmA1wXftArMqdE+7poi2FCWAjkkG0YgC JJlSVcfLduq4B6ji/3e3fFLCJMPs51xO7URZ0/6wO6XSsNajYRyR1eC9dfJxRdb66U +WjfZ2IHSlWTvkfezLjjvj5mBGjf78924Cq27RIc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Viorel Suman , Daniel Baluta , Mark Brown , Sasha Levin Subject: [PATCH 5.1 12/96] ASoC: ak4458: rstn_control - return a non-zero on error only Date: Mon, 8 Jul 2019 17:12:44 +0200 Message-Id: <20190708150527.026869103@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190708150526.234572443@linuxfoundation.org> References: <20190708150526.234572443@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 [ Upstream commit 176a11834b65ec35e3b7a953f87fb9cc41309497 ] snd_soc_component_update_bits() may return 1 if operation was successful and the value of the register changed. Return a non-zero in ak4458_rstn_control for an error only. Signed-off-by: Shengjiu Wang Signed-off-by: Viorel Suman Reviewed-by: Daniel Baluta Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/ak4458.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c index 4c5c3ec92609..71562154c0b1 100644 --- a/sound/soc/codecs/ak4458.c +++ b/sound/soc/codecs/ak4458.c @@ -304,7 +304,10 @@ static int ak4458_rstn_control(struct snd_soc_component *component, int bit) AK4458_00_CONTROL1, AK4458_RSTN_MASK, 0x0); - return ret; + if (ret < 0) + return ret; + + return 0; } static int ak4458_hw_params(struct snd_pcm_substream *substream, -- 2.20.1