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=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 CA575C2D0DB for ; Fri, 24 Jan 2020 10:08:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DE6A214AF for ; Fri, 24 Jan 2020 10:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860516; bh=4iuKSc60k6tRfAKQXXpKvM+yQSF9FiZhpW/bT37TBYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z3CxAnY2OTM7gqMDfjRfsJDd1y7ZgKEXdV2a4DdjJMgOw8nn4dfgEFSeUWbfZt3tE tvXvsY6caXoGMjKGJeIxV7VLCHaaXwWcl/cM0P1ovts4AScHCMQUmtKfwkuEm9lNHZ l3DAwHPxJm3OrBpxNIy00+kENVIUSqRmwgutxudc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389528AbgAXKIf (ORCPT ); Fri, 24 Jan 2020 05:08:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:45366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389338AbgAXKId (ORCPT ); Fri, 24 Jan 2020 05:08:33 -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 CFA282077C; Fri, 24 Jan 2020 10:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860513; bh=4iuKSc60k6tRfAKQXXpKvM+yQSF9FiZhpW/bT37TBYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zf7E01d+yvFvlZkWKGj2Se+zIopEmKPmbmQcy2AbJKY8cn8f34SOBbNLu81+LQhpr umyqBWatEMyIxLuqH62Ar2Rv6b1lsuUEiER6MrmTfI6+y/AVZXh58hsJeyLKS0/N7j xTyBn/CBfkFF2zs3w+jksHgkpmwZJzLsqi8njZOw= 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 4.19 016/639] watchdog: sprd: Fix the incorrect pointer getting from driver data Date: Fri, 24 Jan 2020 10:23:06 +0100 Message-Id: <20200124093049.157704102@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -342,10 +342,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); @@ -354,7 +353,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; @@ -362,7 +360,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);