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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 094DBC433DF for ; Wed, 26 Aug 2020 12:28:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC42F2087D for ; Wed, 26 Aug 2020 12:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598444914; bh=5begK13A57C1a458MwTLaxrZjgC2tYsW7SVnYewFwTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IHr7p3jxuheZ9j6/EdhlGOkB0BF36G8ZhQtQAac+ofMnz4Iw83KCMqJxQV6pdbhf3 Y2yrJj3kcnvZ0q6iaBY+2pw4WHvkp8F/FUyC/PobaYZ+QVt6ZiX9ZrUOEbAbQa2k9R wzgEwhq/jJGZXxInd4KHKRiKen8slod0gh69+Exc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729710AbgHZM2c (ORCPT ); Wed, 26 Aug 2020 08:28:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:60638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729369AbgHZM21 (ORCPT ); Wed, 26 Aug 2020 08:28:27 -0400 Received: from localhost.localdomain (unknown [122.171.38.130]) (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 9BF352087D; Wed, 26 Aug 2020 12:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598444907; bh=5begK13A57C1a458MwTLaxrZjgC2tYsW7SVnYewFwTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NudrIMqo3vdrxqfhs/hSniBGSwAbwd9EtaJ4L6ERTgdByO2mvODjB6ApnD+dNx6Jx pubM0T5K3dE/aRJBPRh2raKegrlD5sy+ivNzwiwBUYJPe4u3pALQ5FzB2z21/y3f4x lcE7TuPZs9u4Bsqw+Og5OD6cHfzpYqnqqFqNXg38= From: Vinod Koul To: Mark Brown Cc: Vinod Koul , Takashi Iwai , Pierre-Louis Bossart , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Oder Chiou , Shuming Fan , Takashi Iwai Subject: [PATCH 2/4] ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw() Date: Wed, 26 Aug 2020 17:58:09 +0530 Message-Id: <20200826122811.3223663-2-vkoul@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200826122811.3223663-1-vkoul@kernel.org> References: <20200826122811.3223663-1-vkoul@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on failure which should be checked with IS_ERR. Also use PTR_ERR for returning error codes. Reported-by: Takashi Iwai Fixes: a87a6653a28c ("ASoC: rt1308-sdw: add rt1308 SdW amplifier driver") Signed-off-by: Vinod Koul --- sound/soc/codecs/rt1308-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c index b0ba0d2acbdd..56e952a904a3 100644 --- a/sound/soc/codecs/rt1308-sdw.c +++ b/sound/soc/codecs/rt1308-sdw.c @@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave, /* Regmap Initialization */ regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap); - if (!regmap) - return -EINVAL; + if (IS_ERR(regmap)) + return PTR_ERR(regmap); rt1308_sdw_init(&slave->dev, regmap, slave); -- 2.26.2