Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3296600pxk; Mon, 21 Sep 2020 09:58:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnl1CxZ4DakeDZQPyhy6rZ15R6DyOxGi+gYg9g22g+aecdiN8d0Ee6+n7PhupJeEI1lAsy X-Received: by 2002:a17:907:9ed:: with SMTP id ce13mr392386ejc.180.1600707510507; Mon, 21 Sep 2020 09:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600707510; cv=none; d=google.com; s=arc-20160816; b=pfSDMyng/NcLcttWkpGVdDeOYRgIxwDTbM99kUthI8sJb9ViBNT5MV5yqlAFWcg3EH 3jU8iVe7SYqndwCyugNuXjsg02O7+UCYYxUZJVZYF7X+WFN2n2r5B9eh6QWemcKyfBBX UG2YgDMDpaRB2u8zXFRE6W4IkffmaqyViqsMMVGAzD5IpvpLmFCHEl6NcZoQFoOBkD+v VNKT1OKK9IJjwvUpbvDEJ7M7BiXOsMSrzLW0WpR1C8WYyTPFkxJm71RysGf1OdtCNGO6 9nVf1A/rZ7zMaKLhC1uVCGeZzfnhWhxj8yv45UDKH423eNWbilp0w9zg8rG0E7PEWi9m El8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hhXrmkkDVLvif7sZMz8Eo9ld2bejsXJSjmaQggPQ1lU=; b=Os49zEMiAs3CS+q7bhps3XDvXctEh5P2OuzLRkV8oIW/mcuUp63CFRjRur5uMCNq5A +++8VPvR+u1GTeextT+dw5HZ5wEPf5HjEeqzpwupE7yNrkWJfGDAxZ5BZ74hFIDwI/Cf IJWJ0Or3YhSqWEXkozIiRm23GrzNdY7A7Fb0YBLnKUj354RoWRjEst8kI7HbKwNa+d3u MJydZZAWgvtdAnJIDtpVZw2hLdgLHI2PZrYvmM+NsF26sVoa+RONc6gKqKOpLnfFlupx JrsV6ihXks+vTynB/spUNkgPkquUX8JjzJMpkdTrEg3pcHTrDFLxaOywSq6+n3t31sGQ gyEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="t+/+iBS9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dm15si8494255edb.236.2020.09.21.09.58.06; Mon, 21 Sep 2020 09:58:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="t+/+iBS9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730200AbgIUQ5J (ORCPT + 99 others); Mon, 21 Sep 2020 12:57:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:49880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729245AbgIUQob (ORCPT ); Mon, 21 Sep 2020 12:44:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 3D0B2239A1; Mon, 21 Sep 2020 16:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706655; bh=kLkns3v2XOq+yM/cQ4Vfa+LOvdDLjxba94WJzGW4rHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t+/+iBS9+/2QPdnu7Uh81ClyhnFW9arh3CMuBEj+evoiU13de/g45+tDQ7xDEZU7g qy4fk9Pnjo3IqIC/LAgsNdd2qf2pgOnnCZJCPHiel33eck5B2qIj99Rf0W1myQhgGp 9S0Kq2XicnxaIbAQSSkZVDDxpSmQMbHikeay8Qko= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , Vinod Koul , Pierre-Louis Bossart , Mark Brown , Sasha Levin Subject: [PATCH 5.8 041/118] ASoC: rt711: Fix return check for devm_regmap_init_sdw() Date: Mon, 21 Sep 2020 18:27:33 +0200 Message-Id: <20200921162038.217062952@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162036.324813383@linuxfoundation.org> References: <20200921162036.324813383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul [ Upstream commit be1a4b2c56db860a220c6f74d461188e5733264a ] 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: 320b8b0d13b8 ("ASoC: rt711: add rt711 codec driver") Signed-off-by: Vinod Koul Reviewed-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200826163340.3249608-4-vkoul@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt711-sdw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c index 45b928954b580..7efff130a638c 100644 --- a/sound/soc/codecs/rt711-sdw.c +++ b/sound/soc/codecs/rt711-sdw.c @@ -452,8 +452,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave, /* Regmap Initialization */ sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap); - if (!sdw_regmap) - return -EINVAL; + if (IS_ERR(sdw_regmap)) + return PTR_ERR(sdw_regmap); regmap = devm_regmap_init(&slave->dev, NULL, &slave->dev, &rt711_regmap); -- 2.25.1