diff options
author | Pavel Kubelun <be.dissent@gmail.com> | 2016-11-19 12:42:22 +0300 |
---|---|---|
committer | Mathias Kresin <dev@kresin.me> | 2016-11-19 17:57:09 +0100 |
commit | 27c355f8a4faf13f438855259afbfd230f9e3a2b (patch) | |
tree | c0a8b5387e5ecc80d58d4657f56a7d0b00c1bf45 /target/linux/ipq806x/patches-4.4/011-2-fix-bld-errs-watchdog-da9052_wdt-Drop-reference-counting.patch | |
parent | 369317ce4873e3831cfed6aaf244025f41b569fc (diff) | |
download | upstream-27c355f8a4faf13f438855259afbfd230f9e3a2b.tar.gz upstream-27c355f8a4faf13f438855259afbfd230f9e3a2b.tar.bz2 upstream-27c355f8a4faf13f438855259afbfd230f9e3a2b.zip |
ipq806x: fix build errors
Add missing patches that broke LEDE builder while updating WDT driver
Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/patches-4.4/011-2-fix-bld-errs-watchdog-da9052_wdt-Drop-reference-counting.patch')
-rw-r--r-- | target/linux/ipq806x/patches-4.4/011-2-fix-bld-errs-watchdog-da9052_wdt-Drop-reference-counting.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/target/linux/ipq806x/patches-4.4/011-2-fix-bld-errs-watchdog-da9052_wdt-Drop-reference-counting.patch b/target/linux/ipq806x/patches-4.4/011-2-fix-bld-errs-watchdog-da9052_wdt-Drop-reference-counting.patch new file mode 100644 index 0000000000..501bd13636 --- /dev/null +++ b/target/linux/ipq806x/patches-4.4/011-2-fix-bld-errs-watchdog-da9052_wdt-Drop-reference-counting.patch @@ -0,0 +1,87 @@ +From 756d1e9247dff6d416b0c9e073247f5e808bb5fa Mon Sep 17 00:00:00 2001 +From: Guenter Roeck <linux@roeck-us.net> +Date: Fri, 25 Dec 2015 16:01:43 -0800 +Subject: watchdog: da9052_wdt: Drop reference counting + +Reference counting is now implemented in the watchdog core and no longer +required in watchdog drivers. + +Since it was implememented a no-op, and since the local memory is allocated +with devm_kzalloc(), the reference counting code in the driver really did +not really work anyway, and this patch effectively fixes a bug which could +cause a crash on unloading if the watchdog device was still open. + +Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Wim Van Sebroeck <wim@iguana.be> +--- + drivers/watchdog/da9052_wdt.c | 24 ------------------------ + 1 file changed, 24 deletions(-) + +--- a/drivers/watchdog/da9052_wdt.c ++++ b/drivers/watchdog/da9052_wdt.c +@@ -31,7 +31,6 @@ + struct da9052_wdt_data { + struct watchdog_device wdt; + struct da9052 *da9052; +- struct kref kref; + unsigned long jpast; + }; + +@@ -51,10 +50,6 @@ static const struct { + }; + + +-static void da9052_wdt_release_resources(struct kref *r) +-{ +-} +- + static int da9052_wdt_set_timeout(struct watchdog_device *wdt_dev, + unsigned int timeout) + { +@@ -104,20 +99,6 @@ static int da9052_wdt_set_timeout(struct + return 0; + } + +-static void da9052_wdt_ref(struct watchdog_device *wdt_dev) +-{ +- struct da9052_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev); +- +- kref_get(&driver_data->kref); +-} +- +-static void da9052_wdt_unref(struct watchdog_device *wdt_dev) +-{ +- struct da9052_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev); +- +- kref_put(&driver_data->kref, da9052_wdt_release_resources); +-} +- + static int da9052_wdt_start(struct watchdog_device *wdt_dev) + { + return da9052_wdt_set_timeout(wdt_dev, wdt_dev->timeout); +@@ -170,8 +151,6 @@ static const struct watchdog_ops da9052_ + .stop = da9052_wdt_stop, + .ping = da9052_wdt_ping, + .set_timeout = da9052_wdt_set_timeout, +- .ref = da9052_wdt_ref, +- .unref = da9052_wdt_unref, + }; + + +@@ -198,8 +177,6 @@ static int da9052_wdt_probe(struct platf + da9052_wdt->parent = &pdev->dev; + watchdog_set_drvdata(da9052_wdt, driver_data); + +- kref_init(&driver_data->kref); +- + ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG, + DA9052_CONTROLD_TWDSCALE, 0); + if (ret < 0) { +@@ -225,7 +202,6 @@ static int da9052_wdt_remove(struct plat + struct da9052_wdt_data *driver_data = platform_get_drvdata(pdev); + + watchdog_unregister_device(&driver_data->wdt); +- kref_put(&driver_data->kref, da9052_wdt_release_resources); + + return 0; + } |