Commit 39e68d9e authored by Shuiqing Li's avatar Shuiqing Li Committed by Wim Van Sebroeck

watchdog: sprd: Fix the incorrect pointer getting from driver data

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: 47760346 ("watchdog: Add Spreadtrum watchdog driver")
Reported-by: default avatarDongwei Wang <dongwei.wang@unisoc.com>
Signed-off-by: default avatarShuiqing Li <shuiqing.li@unisoc.com>
Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/76d4687189ec940baa90cb8d679a8d4c8f02ee80.1573210405.git.baolin.wang@linaro.orgSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent c0457125
...@@ -327,10 +327,9 @@ static int sprd_wdt_probe(struct platform_device *pdev) ...@@ -327,10 +327,9 @@ static int sprd_wdt_probe(struct platform_device *pdev)
static int __maybe_unused sprd_wdt_pm_suspend(struct device *dev) 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); struct sprd_wdt *wdt = dev_get_drvdata(dev);
if (watchdog_active(wdd)) if (watchdog_active(&wdt->wdd))
sprd_wdt_stop(&wdt->wdd); sprd_wdt_stop(&wdt->wdd);
sprd_wdt_disable(wdt); sprd_wdt_disable(wdt);
...@@ -339,7 +338,6 @@ static int __maybe_unused sprd_wdt_pm_suspend(struct device *dev) ...@@ -339,7 +338,6 @@ static int __maybe_unused sprd_wdt_pm_suspend(struct device *dev)
static int __maybe_unused sprd_wdt_pm_resume(struct device *dev) 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); struct sprd_wdt *wdt = dev_get_drvdata(dev);
int ret; int ret;
...@@ -347,7 +345,7 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev) ...@@ -347,7 +345,7 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev)
if (ret) if (ret)
return ret; return ret;
if (watchdog_active(wdd)) { if (watchdog_active(&wdt->wdd)) {
ret = sprd_wdt_start(&wdt->wdd); ret = sprd_wdt_start(&wdt->wdd);
if (ret) { if (ret) {
sprd_wdt_disable(wdt); sprd_wdt_disable(wdt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment