From patchwork Wed Jul 24 19:20:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 169644 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10670444ilk; Wed, 24 Jul 2019 12:56:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7rzvr7hulFYOF9dAAV6I0J04CFyQpBCw72paoDNs+UElpvTrsViGSGrLmj2Zxq6dxFVTa X-Received: by 2002:a17:902:2889:: with SMTP id f9mr82974829plb.230.1563998216302; Wed, 24 Jul 2019 12:56:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563998216; cv=none; d=google.com; s=arc-20160816; b=qhLYRqLJ3tw8oA9BdhhKiKAz96uOxs5cEe7yiTe62qbwJo7Q2cENqboYajDeLkAdnh AejrCBl5r9VcBo2Q1oQu3c0yZIMDsdEeVnXwsAyCPFYtgpqfzRZh3meqZdwq8Z9inhoo HSf7fAniKzOwtXuWd+JKz6ev0n0ud5eTFdPBMSkFpeCG0+Snmoe47ODBdGDBjbvRJZQb ODY/m44q3IIpIQTQXdTCpobeBSp7AwwVk0YDUphNJrdnB022zpwyQOeTcGzePrxYfRax mZki9L2eJcpyq2wprgByHumcP4gsWnLhM6hFuWQ6geaJu/cHBRRvlUsCkkkYYIoiKFJL wWMg== 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=fe+p10YfnyqcFUyaZQKDg/pc4hRRGQ7ZskTdE32j60w=; b=Wq0CDza4/GBd9eedLnQsuCj5lXWLPZCFJY1MyU6V74poFMsUpEbgIsEKvMdJKXH7Oy RKyc0sj5qkL8v9cBAjwkiOm6xf+MIp8e7qAH9Jhi79pF5ulJ04jCgQBwmeDFzb2dSV1w QnhSPW8e1SZPFDeEcWGsLB1s1fjrJvGIOSEXcresK3WW4ap+3qTyOidTi37WqwIyRKyt JNzI0iU5yXViEsO+dXLnuE0YNcxu1VwYxcxBxiI/MCD6WRC27VUAKfB/A5U9LfvhPLwg UmrQdd1Fb6Zbo9ILHUfibXWtuDXRYKl9Qm+e/PCHbA3I1bIc+xzlwOZntkCTbCPrc9e7 ddcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=evZ4iP3S; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 s126si9376058pgs.431.2019.07.24.12.56.56; Wed, 24 Jul 2019 12:56:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=evZ4iP3S; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404706AbfGXT4y (ORCPT + 14 others); Wed, 24 Jul 2019 15:56:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:41720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404466AbfGXT4y (ORCPT ); Wed, 24 Jul 2019 15:56:54 -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 B9B8421873; Wed, 24 Jul 2019 19:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998213; bh=2HnvleEuQXWEcpKX9BILP/+xkRxnVYQLF0R4G6X7+yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=evZ4iP3StSPWUZe4K+vPQgpU0LdSOVEfo4GtI3T5XVvEnSsS4uptWfj4rMEUSrtC1 FAketQ58xTWv1K440HFRDVSWo30cqjSrpkOOt6vfAuMfk8VPQbdnj8ySpWcyDN/hpw PYP9C0CXuutrcANpB7UG5LBXRntS9nPctElhB+Ro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown Subject: [PATCH 5.1 285/371] ASoC: core: Adapt for debugfs API change Date: Wed, 24 Jul 2019 21:20:37 +0200 Message-Id: <20190724191745.736560057@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@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: Mark Brown commit c2c928c93173f220955030e8440517b87ec7df92 upstream. Back in ff9fb72bc07705c (debugfs: return error values, not NULL) the debugfs APIs were changed to return error pointers rather than NULL pointers on error, breaking the error checking in ASoC. Update the code to use IS_ERR() and log the codes that are returned as part of the error messages. Fixes: ff9fb72bc07705c (debugfs: return error values, not NULL) Signed-off-by: Mark Brown Cc: stable@vger.kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/soc-core.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -158,9 +158,10 @@ static void soc_init_component_debugfs(s component->card->debugfs_card_root); } - if (!component->debugfs_root) { + if (IS_ERR(component->debugfs_root)) { dev_warn(component->dev, - "ASoC: Failed to create component debugfs directory\n"); + "ASoC: Failed to create component debugfs directory: %ld\n", + PTR_ERR(component->debugfs_root)); return; } @@ -212,18 +213,21 @@ static void soc_init_card_debugfs(struct card->debugfs_card_root = debugfs_create_dir(card->name, snd_soc_debugfs_root); - if (!card->debugfs_card_root) { + if (IS_ERR(card->debugfs_card_root)) { dev_warn(card->dev, - "ASoC: Failed to create card debugfs directory\n"); + "ASoC: Failed to create card debugfs directory: %ld\n", + PTR_ERR(card->debugfs_card_root)); + card->debugfs_card_root = NULL; return; } card->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644, card->debugfs_card_root, &card->pop_time); - if (!card->debugfs_pop_time) + if (IS_ERR(card->debugfs_pop_time)) dev_warn(card->dev, - "ASoC: Failed to create pop time debugfs file\n"); + "ASoC: Failed to create pop time debugfs file: %ld\n", + PTR_ERR(card->debugfs_pop_time)); } static void soc_cleanup_card_debugfs(struct snd_soc_card *card)