From patchwork Mon Sep 18 22:50:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 141638 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3060085vqi; Mon, 18 Sep 2023 18:13:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+4pRRWgN166IckaCvpA8uwdAzX6/ip0RLhaW8d4BArznVkscjR3cz+ztb1pi5MYo5gieF X-Received: by 2002:a05:6a00:2283:b0:690:25fb:bac1 with SMTP id f3-20020a056a00228300b0069025fbbac1mr11027180pfe.18.1695085984995; Mon, 18 Sep 2023 18:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695085984; cv=none; d=google.com; s=arc-20160816; b=TO4814FyCL5e3URIegDHicRltKeUJ/TQegx/ODQbghwQdG7ieGNaSligd2RBlUaeQ4 Cr7Lkw4uYiDbicPcYtHO0BO54l3GptD9GbExFFu7tegj5ieR+3R4UtzuWjn3shfPTjAv EWwuHvjcDocUe2Zz0OneFnOPtwFuMOKiYUBvWOSntmtnwBPnVkLrPftdXVaTQ82rNg/F 6/LNRSYqb7mAjIsJtIFnDdSknrcAYrFt3oi4CTfqUImMnl2kz9QWK1O5aL0ThmYdYHcj MORXRjEgbql/W0Qsebf9xP6WgMWHg2d7/ay5dnEq+2XkOH5p0m6a2BqAKXem1aslr3rz 1JjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:content-transfer-encoding :mime-version:subject:references:in-reply-to:message-id:date :dkim-signature; bh=SryBlZPy2iZ5cbTHoArD0hEli4AWkDS8L47ZF0YtzOs=; fh=xnTpUW4XeRWRys1QsGgvUm1/Xf7eS63yPkmxSBv5Q38=; b=Ss79rqT2FO3P9jxYJe0YF4gwvtNE72tYgNvkKaoohQzy8NzoMPABb9fRH551dOQ5LC QQZOjbDmW4GgF72A+PlX6ueJKDDkqoGzocPwJeLjjsCKVlq+5ix9vmACLU6NNLAz13VY 3KbrrbXnGeZwvrBN2sUe+R5ux91dSIUXNdDhDBqXAnrQCC52o2HymN1ZAbfdnk0zhI+C bzX9OhKZOfwNkwXsGQnbwA7euCvcyY/Nif6LDlITK9hOYpAwckhhnothpoEZFgndPGAM o381TrnsF4DK/zcZXHNeXEMsuAHCVV3d7b7SFwJC3LN+WX7He51Tm/hz7QJBrEE+DkGj j9pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rere.qmqm.pl header.s=1 header.b=ZF4O5EQF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=rere.qmqm.pl Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id f5-20020aa782c5000000b0068a140568b4si8750796pfn.348.2023.09.18.18.13.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 18:13:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@rere.qmqm.pl header.s=1 header.b=ZF4O5EQF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=rere.qmqm.pl Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 7A40A808D48E; Mon, 18 Sep 2023 15:50:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbjIRWui (ORCPT + 25 others); Mon, 18 Sep 2023 18:50:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjIRWug (ORCPT ); Mon, 18 Sep 2023 18:50:36 -0400 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C2F491 for ; Mon, 18 Sep 2023 15:50:31 -0700 (PDT) Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4RqKkq5vPwzMG; Tue, 19 Sep 2023 00:50:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1695077427; bh=IhP3GWRGjyGl/XiVtu7/EHAPbVQwMJ4tvGHH3lP7MPM=; h=Date:In-Reply-To:References:Subject:From:To:Cc:From; b=ZF4O5EQFp1osSqdFmFFop9x4dFOaNyxpUobc/Lnmr9pO7Ptqz9CUUydNontsijbBE mtUzxd5r8uRdGTmbUlFHIn9x93nl7CnNJW/tbVxOu54NVZZw5LeYI71Yq5lrhyS7az wN9C+FmYYO4jMmvqpzElgkIHxuHv5/UkfVBTxWTGG53LwKVcMnajmdajZDk6OFxwgt XEbo7XrADhVqUGEljIo42Q5i/nJvrzDoapcuXEbsFcJWcBYcRRVsix0mvgLuOvPZhZ cQnrBfeOJF0CVznGdH/R7qOz9Y2seIWndGwIAkMcOpTylKuQSv9ZrEV/w/ckQ1d9ru K5Tx4s1ZxKifg== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at mail Date: Tue, 19 Sep 2023 00:50:27 +0200 Message-Id: In-Reply-To: References: Subject: [PATCH v2 2/2] regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()" MIME-Version: 1.0 From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Vladimir Zapolskiy X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 18 Sep 2023 15:50:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777426482022041830 X-GMAIL-MSGID: 1777426482022041830 This reverts commit 5f4b204b6b8153923d5be8002c5f7082985d153f. Since rdev->dev now has a release() callback, the proper way of freeing the initialized device can be restored. Signed-off-by: Michał Mirosław --- drivers/regulator/core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 2820badc7a12..3137e40fcd3e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5724,15 +5724,11 @@ regulator_register(struct device *dev, mutex_lock(®ulator_list_mutex); regulator_ena_gpio_free(rdev); mutex_unlock(®ulator_list_mutex); - put_device(&rdev->dev); - rdev = NULL; clean: if (dangling_of_gpiod) gpiod_put(config->ena_gpiod); - if (rdev && rdev->dev.of_node) - of_node_put(rdev->dev.of_node); - kfree(rdev); kfree(config); + put_device(&rdev->dev); rinse: if (dangling_cfg_gpiod) gpiod_put(cfg->ena_gpiod);