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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 1412AC2D0CE for ; Fri, 24 Jan 2020 09:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8BA020838 for ; Fri, 24 Jan 2020 09:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858753; bh=W4BrzCGdtCuJN0x1SCYKls5ds5WiIvXaIVfY3fL0VRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=081YpoJMD7K6dfM7dCKFNmfs+sBGym09VR+iSsa6CcXcpIG6YYuxx21zJYNePH8MC 0anUWIXe4jKQUrjm6qt+duNRENv2AW26vTiy5ihwWXWzNNncmiTQoXsO6N5LDl+hrM EYMVr3HRgak1G28+Hnq6UalhoTyrofWhczk4ng9A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731458AbgAXJjF (ORCPT ); Fri, 24 Jan 2020 04:39:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:36228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729924AbgAXJjF (ORCPT ); Fri, 24 Jan 2020 04:39:05 -0500 Received: from localhost (unknown [145.15.244.15]) (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 0F9E12070A; Fri, 24 Jan 2020 09:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858744; bh=W4BrzCGdtCuJN0x1SCYKls5ds5WiIvXaIVfY3fL0VRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nWdBBA1+uAkx78quhVghOnlaxHqqTkyIlYSYSMYA12hY7p/rs+3M/YUr0WyJDXhWa Aly8Uhj2+YTsC7IYnGVrXVYGQVmj5zTJa8GBIH+k59bp6kRCrndHujwF88he/EO72M VAce2B39CfkzfZ6LrAtGzZzrxaUK4gIasi3WZZW8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dongwei Wang , Shuiqing Li , Baolin Wang , Guenter Roeck , Wim Van Sebroeck Subject: [PATCH 5.4 045/102] watchdog: sprd: Fix the incorrect pointer getting from driver data Date: Fri, 24 Jan 2020 10:30:46 +0100 Message-Id: <20200124092813.082845730@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shuiqing Li commit 39e68d9e7ab276880980ee5386301fb218202192 upstream. The device driver data saved the 'struct sprd_wdt' object, it is incorrect to get 'struct watchdog_device' object from the driver data, thus fix it. Fixes: 477603467009 ("watchdog: Add Spreadtrum watchdog driver") Reported-by: Dongwei Wang Signed-off-by: Shuiqing Li Signed-off-by: Baolin Wang Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/76d4687189ec940baa90cb8d679a8d4c8f02ee80.1573210405.git.baolin.wang@linaro.org Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman --- drivers/watchdog/sprd_wdt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/watchdog/sprd_wdt.c +++ b/drivers/watchdog/sprd_wdt.c @@ -327,10 +327,9 @@ static int sprd_wdt_probe(struct platfor static int __maybe_unused sprd_wdt_pm_suspend(struct device *dev) { - struct watchdog_device *wdd = dev_get_drvdata(dev); struct sprd_wdt *wdt = dev_get_drvdata(dev); - if (watchdog_active(wdd)) + if (watchdog_active(&wdt->wdd)) sprd_wdt_stop(&wdt->wdd); sprd_wdt_disable(wdt); @@ -339,7 +338,6 @@ static int __maybe_unused sprd_wdt_pm_su static int __maybe_unused sprd_wdt_pm_resume(struct device *dev) { - struct watchdog_device *wdd = dev_get_drvdata(dev); struct sprd_wdt *wdt = dev_get_drvdata(dev); int ret; @@ -347,7 +345,7 @@ static int __maybe_unused sprd_wdt_pm_re if (ret) return ret; - if (watchdog_active(wdd)) { + if (watchdog_active(&wdt->wdd)) { ret = sprd_wdt_start(&wdt->wdd); if (ret) { sprd_wdt_disable(wdt);