diff options
author | Pavel Kubelun <be.dissent@gmail.com> | 2016-11-04 02:12:32 +0300 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2016-11-16 10:59:30 +0100 |
commit | 793d448a51b53d81e2dbd58a5865a204de92ad34 (patch) | |
tree | c0bc1ee32bdff6336dfa73288b5d7f2ac8564a7b /target/linux/ipq806x/patches-4.4/010-2-qcom-wdt-Do-not-set-dev-in-struct-watchdog_device.patch | |
parent | 4a6f9fc6333d5043d4ddfd25d87be3ae17f9e794 (diff) | |
download | upstream-793d448a51b53d81e2dbd58a5865a204de92ad34.tar.gz upstream-793d448a51b53d81e2dbd58a5865a204de92ad34.tar.bz2 upstream-793d448a51b53d81e2dbd58a5865a204de92ad34.zip |
ipq806x: backport upstream wdt driver
Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/patches-4.4/010-2-qcom-wdt-Do-not-set-dev-in-struct-watchdog_device.patch')
-rw-r--r-- | target/linux/ipq806x/patches-4.4/010-2-qcom-wdt-Do-not-set-dev-in-struct-watchdog_device.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/ipq806x/patches-4.4/010-2-qcom-wdt-Do-not-set-dev-in-struct-watchdog_device.patch b/target/linux/ipq806x/patches-4.4/010-2-qcom-wdt-Do-not-set-dev-in-struct-watchdog_device.patch new file mode 100644 index 0000000000..31371c2c81 --- /dev/null +++ b/target/linux/ipq806x/patches-4.4/010-2-qcom-wdt-Do-not-set-dev-in-struct-watchdog_device.patch @@ -0,0 +1,25 @@ +From 0933b453f1c7104d873aacf8524f8ac380a7ed08 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck <linux@roeck-us.net> +Date: Thu, 24 Dec 2015 14:22:04 -0800 +Subject: watchdog: qcom-wdt: Do not set 'dev' in struct watchdog_device + +The 'dev' pointer in struct watchdog_device is set by the watchdog core +when registering the watchdog device and not by the driver. It points to +the watchdog device, not its parent. + +Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Wim Van Sebroeck <wim@iguana.be> +--- + drivers/watchdog/qcom-wdt.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/watchdog/qcom-wdt.c ++++ b/drivers/watchdog/qcom-wdt.c +@@ -164,7 +164,6 @@ static int qcom_wdt_probe(struct platfor + goto err_clk_unprepare; + } + +- wdt->wdd.dev = &pdev->dev; + wdt->wdd.info = &qcom_wdt_info; + wdt->wdd.ops = &qcom_wdt_ops; + wdt->wdd.min_timeout = 1; |