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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 7626BC33CAF for ; Thu, 16 Jan 2020 18:58:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42DE5206E6 for ; Thu, 16 Jan 2020 18:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579201091; bh=HkmnNsR1/AIFnpJIxKjbHUx1bnzgrSlA32Fwzvhzxdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XY9+YnlKkKysQ07wZjAc6cxfBi0UJ1WIc1LnR5Hn5ydDtJY9rh3AUA6AWvKA/0Y+j vUuaQ2WslNSVE0AdnwVPl0y3Tfaa3n4pQbTcu+LJ7zmiQnp3Pfi1wK3RcQlHalpRiN VG2rpKY8BZmY8ZCanuMCLY6yw7B1hVQxRMalSL5I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407243AbgAPS6H (ORCPT ); Thu, 16 Jan 2020 13:58:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:37864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389024AbgAPRGx (ORCPT ); Thu, 16 Jan 2020 12:06:53 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A8FF021582; Thu, 16 Jan 2020 17:06:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194413; bh=HkmnNsR1/AIFnpJIxKjbHUx1bnzgrSlA32Fwzvhzxdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=swz7TVaqcyn8QwyeqFDi2LFRGuIMNH+fLmqhXejHxxNFZnYVs299sNm4X+wGKChWq T4duWZNOG9WAdHFVC/4NMKOlh5ph8Grfc2Mk3O2iOTSIUaAvSTE2nHIywNXhNwslAO bc23HJGEU+Utn8yG+NzqM9yLoBNDLSLa6lPrkEWc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guenter Roeck , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Wim Van Sebroeck , Sasha Levin , linux-watchdog@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 335/671] watchdog: rtd119x_wdt: Fix remove function Date: Thu, 16 Jan 2020 11:59:33 -0500 Message-Id: <20200116170509.12787-72-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit 8dd29f19512cc75ee470d7bb8ec86af199de23a8 ] The driver registers the watchdog with devm_watchdog_register_device() but still calls watchdog_unregister_device() on remove. Since clocks have to be stopped when removing the driver, after the watchdog device has been unregistered, we can not drop the call to watchdog_unregister_device(). Use watchdog_register_device() to register the watchdog. Fixes: 2bdf6acbfead7 ("watchdog: Add Realtek RTD1295") Cc: Andreas Färber Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/rtd119x_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c index d001c17ddfde..99caec6882d2 100644 --- a/drivers/watchdog/rtd119x_wdt.c +++ b/drivers/watchdog/rtd119x_wdt.c @@ -135,7 +135,7 @@ static int rtd119x_wdt_probe(struct platform_device *pdev) rtd119x_wdt_set_timeout(&data->wdt_dev, data->wdt_dev.timeout); rtd119x_wdt_stop(&data->wdt_dev); - ret = devm_watchdog_register_device(&pdev->dev, &data->wdt_dev); + ret = watchdog_register_device(&data->wdt_dev); if (ret) { clk_disable_unprepare(data->clk); clk_put(data->clk); -- 2.20.1