From patchwork Tue Oct 27 13:53:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 307250 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 60166C5517A for ; Tue, 27 Oct 2020 16:56:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 104FC20728 for ; Tue, 27 Oct 2020 16:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603817817; bh=8XrLhX+dLMei6k1PgEId0kWczGKRrnemW564Nqas2DU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UmLxcf2cAIIjbj3ASLUksnibb/fggwdPuMl2m4Au7HneX4oahSjxxbf5PW8M/f7yp UL/nF+Kt7/pMbZ0PllY/j+DF809jv7jUSE+7Zf+QSpJEUMtN/9UuJ0Z3hsrouk3fb/ RZ8CY52/0TnHzTwf6uZZZmHasA2o/v9StG/yjz5k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1814525AbgJ0Q4t (ORCPT ); Tue, 27 Oct 2020 12:56:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:45898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1794157AbgJ0PKO (ORCPT ); Tue, 27 Oct 2020 11:10:14 -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 B12C8206F4; Tue, 27 Oct 2020 15:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811414; bh=8XrLhX+dLMei6k1PgEId0kWczGKRrnemW564Nqas2DU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JsQo4s68e85+CtkwPBhwEnLlorRgZ4KSbY6rNI5wTCOmTIUSPcNZrfbfxL8dYBRZb kVSFR6hBlxqs0PxYO3Fym0qo6sTZU4SknnAB4mjKIiWasdQV+4cmLX48Qihlmh/soE vFfBffCqw+fISOW2+JRoCZTGUQ7GqtGq4qdFekhA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Guenter Roeck , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 5.8 454/633] watchdog: Use put_device on error Date: Tue, 27 Oct 2020 14:53:17 +0100 Message-Id: <20201027135544.016863949@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dinghao Liu [ Upstream commit 937425d4cd3ae4e2882b41e332bbbab616bcf0ad ] We should use put_device() instead of freeing device directly after device_initialize(). Fixes: cb36e29bb0e4b ("watchdog: initialize device before misc_register") Signed-off-by: Dinghao Liu Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20200824031230.31050-1-dinghao.liu@zju.edu.cn Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/watchdog_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index d772dff789f3c..c2065615fd6ca 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -1020,7 +1020,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) pr_err("%s: a legacy watchdog module is probably present.\n", wdd->info->identity); old_wd_data = NULL; - kfree(wd_data); + put_device(&wd_data->dev); return err; } }