From 27c355f8a4faf13f438855259afbfd230f9e3a2b Mon Sep 17 00:00:00 2001 From: Pavel Kubelun Date: Sat, 19 Nov 2016 12:42:22 +0300 Subject: ipq806x: fix build errors Add missing patches that broke LEDE builder while updating WDT driver Signed-off-by: Pavel Kubelun --- ...tchdog-da9055_wdt-Drop-reference-counting.patch | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 target/linux/ipq806x/patches-4.4/011-3-fix-bld-errs-watchdog-da9055_wdt-Drop-reference-counting.patch (limited to 'target/linux/ipq806x/patches-4.4/011-3-fix-bld-errs-watchdog-da9055_wdt-Drop-reference-counting.patch') diff --git a/target/linux/ipq806x/patches-4.4/011-3-fix-bld-errs-watchdog-da9055_wdt-Drop-reference-counting.patch b/target/linux/ipq806x/patches-4.4/011-3-fix-bld-errs-watchdog-da9055_wdt-Drop-reference-counting.patch new file mode 100644 index 0000000000..3cf723a9bc --- /dev/null +++ b/target/linux/ipq806x/patches-4.4/011-3-fix-bld-errs-watchdog-da9055_wdt-Drop-reference-counting.patch @@ -0,0 +1,80 @@ +From 43f676ace2e0591718ff493d290bc49b35ec2ffc Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Fri, 25 Dec 2015 16:01:44 -0800 +Subject: watchdog: da9055_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 +Signed-off-by: Wim Van Sebroeck +--- + drivers/watchdog/da9055_wdt.c | 24 ------------------------ + 1 file changed, 24 deletions(-) + +--- a/drivers/watchdog/da9055_wdt.c ++++ b/drivers/watchdog/da9055_wdt.c +@@ -35,7 +35,6 @@ MODULE_PARM_DESC(nowayout, + struct da9055_wdt_data { + struct watchdog_device wdt; + struct da9055 *da9055; +- struct kref kref; + }; + + static const struct { +@@ -99,24 +98,6 @@ static int da9055_wdt_ping(struct watchd + DA9055_WATCHDOG_MASK, 1); + } + +-static void da9055_wdt_release_resources(struct kref *r) +-{ +-} +- +-static void da9055_wdt_ref(struct watchdog_device *wdt_dev) +-{ +- struct da9055_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev); +- +- kref_get(&driver_data->kref); +-} +- +-static void da9055_wdt_unref(struct watchdog_device *wdt_dev) +-{ +- struct da9055_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev); +- +- kref_put(&driver_data->kref, da9055_wdt_release_resources); +-} +- + static int da9055_wdt_start(struct watchdog_device *wdt_dev) + { + return da9055_wdt_set_timeout(wdt_dev, wdt_dev->timeout); +@@ -138,8 +119,6 @@ static const struct watchdog_ops da9055_ + .stop = da9055_wdt_stop, + .ping = da9055_wdt_ping, + .set_timeout = da9055_wdt_set_timeout, +- .ref = da9055_wdt_ref, +- .unref = da9055_wdt_unref, + }; + + static int da9055_wdt_probe(struct platform_device *pdev) +@@ -165,8 +144,6 @@ static int da9055_wdt_probe(struct platf + watchdog_set_nowayout(da9055_wdt, nowayout); + watchdog_set_drvdata(da9055_wdt, driver_data); + +- kref_init(&driver_data->kref); +- + ret = da9055_wdt_stop(da9055_wdt); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to stop watchdog, %d\n", ret); +@@ -189,7 +166,6 @@ static int da9055_wdt_remove(struct plat + struct da9055_wdt_data *driver_data = platform_get_drvdata(pdev); + + watchdog_unregister_device(&driver_data->wdt); +- kref_put(&driver_data->kref, da9055_wdt_release_resources); + + return 0; + } -- cgit v1.2.3