From patchwork Mon Aug 17 15:14:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 266128 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=-12.8 required=3.0 tests=BAYES_00,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=unavailable 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 8100DC433E1 for ; Mon, 17 Aug 2020 18:53:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69E092072E for ; Mon, 17 Aug 2020 18:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597690405; bh=VWmT7DivvuLLpk1VqkGxkkaQT9AQLwz2NodPusgo7s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Qvsa1xrBcee4GCleR5KsFYo3jHHRYNLMB6n0e1FeNHFAmaCjtYzre9Ep5Lwdlpn6g 7otPohPYoYAC7aNsssYzg+NPKDxa/b/1z7gweoXI0OScwJFmw9MziG8vplHMgc4w0T lHeMLg4DNL39Ta5hvBfuyn10C1OJGjn7PjAigiQc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387881AbgHQSxE (ORCPT ); Mon, 17 Aug 2020 14:53:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:37776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387829AbgHQPwA (ORCPT ); Mon, 17 Aug 2020 11:52:00 -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 50763208C7; Mon, 17 Aug 2020 15:51:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679519; bh=VWmT7DivvuLLpk1VqkGxkkaQT9AQLwz2NodPusgo7s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CsEhUQ2U2xTn1fhTYvIKoDVUHFAl/880NNXo0qRmfIaqGwkqkHkIYpYbpiQzrY2Pu kkJo4eceAqww/mUP3QItmqn9CKK/QWi+7w4XZDENoySSZOW7NMcEnru4meARvYSoca GCMIYIKN5l8kbu8QmyHp9tew9A+t6hiRw9BfaI+8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Murphy , Mark Brown , Sasha Levin Subject: [PATCH 5.7 240/393] ASoC: tas2770: Fix reset gpio property name Date: Mon, 17 Aug 2020 17:14:50 +0200 Message-Id: <20200817143831.260640723@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Murphy [ Upstream commit 58b868f51d6e38146e44cb09fcd92b5fc35d83bc ] Fix the reset property name when allocating the GPIO descriptor. The gpiod_get_optional appends either the -gpio or -gpios suffix to the name. Fixes: 1a476abc723e6 ("tas2770: add tas2770 smart PA kernel driver") Signed-off-by: Dan Murphy Link: https://lore.kernel.org/r/20200720181202.31000-2-dmurphy@ti.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/tas2770.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c index 54c8135fe43c1..cf071121c8398 100644 --- a/sound/soc/codecs/tas2770.c +++ b/sound/soc/codecs/tas2770.c @@ -758,8 +758,7 @@ static int tas2770_i2c_probe(struct i2c_client *client, } } - tas2770->reset_gpio = devm_gpiod_get_optional(tas2770->dev, - "reset-gpio", + tas2770->reset_gpio = devm_gpiod_get_optional(tas2770->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(tas2770->reset_gpio)) { if (PTR_ERR(tas2770->reset_gpio) == -EPROBE_DEFER) {