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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CA71C6FA99 for ; Fri, 10 Mar 2023 14:31:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232462AbjCJObK (ORCPT ); Fri, 10 Mar 2023 09:31:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232365AbjCJOax (ORCPT ); Fri, 10 Mar 2023 09:30:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC27611F6A8 for ; Fri, 10 Mar 2023 06:29:47 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 53B49618C9 for ; Fri, 10 Mar 2023 14:29:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57115C433D2; Fri, 10 Mar 2023 14:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678458586; bh=orieMbNCaWkVcJPqUAvB+E4NkQt97v0A3lmv1koK+hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aYk0UNKVz1ESMfruAEO86bJ8rfh3kJ4BpQVpvKRAXdZCezaM/lhsjK9kMEOYOv77G vUsyVcs0YiZFsIRm9dNKXMLflKq3Lo7CXb2v7ZtDLgUgSTbtrYYMFK7u/gcMMBL068 DzGXO/txJfgnPiZgAOI2GtsDpSp7a6DDgYsql97s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qi Zheng , Viresh Kumar , Sasha Levin Subject: [PATCH 5.4 076/357] OPP: fix error checking in opp_migrate_dentry() Date: Fri, 10 Mar 2023 14:36:05 +0100 Message-Id: <20230310133737.344336608@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133733.973883071@linuxfoundation.org> References: <20230310133733.973883071@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qi Zheng [ Upstream commit eca4c0eea53432ec4b711b2a8ad282cbad231b4f ] Since commit ff9fb72bc077 ("debugfs: return error values, not NULL") changed return value of debugfs_rename() in error cases from %NULL to %ERR_PTR(-ERROR), we should also check error values instead of NULL. Fixes: ff9fb72bc077 ("debugfs: return error values, not NULL") Signed-off-by: Qi Zheng Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/opp/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/opp/debugfs.c b/drivers/opp/debugfs.c index 609665e339b6b..c7647410316e6 100644 --- a/drivers/opp/debugfs.c +++ b/drivers/opp/debugfs.c @@ -162,7 +162,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev, dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir, opp_table->dentry_name); - if (!dentry) { + if (IS_ERR(dentry)) { dev_err(dev, "%s: Failed to rename link from: %s to %s\n", __func__, dev_name(opp_dev->dev), dev_name(dev)); return; -- 2.39.2