From: Greg Kroah-Hartman Date: Sat, 7 Dec 2019 11:33:42 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v5.4.3~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=934b617fa9dc0a85f24a5d9af3979ca024db7454;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: dmaengine-coh901318-remove-unused-variable.patch --- diff --git a/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch b/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch index 7a38122e9d3..60a282c2d2f 100644 --- a/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch +++ b/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch @@ -20,15 +20,14 @@ Signed-off-by: Jia-Ju Bai Reviewed-by: Linus Walleij Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/dma/coh901318.c | 4 ---- + drivers/dma/coh901318.c | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c -index c340ca9bd2b5d..69852a99fc243 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c -@@ -1815,8 +1815,6 @@ static int coh901318_config(struct coh901318_chan *cohc, +@@ -1815,8 +1815,6 @@ static int coh901318_config(struct coh90 int channel = cohc->id; void __iomem *virtbase = cohc->base->virtbase; @@ -37,7 +36,7 @@ index c340ca9bd2b5d..69852a99fc243 100644 if (param) p = param; else -@@ -1836,8 +1834,6 @@ static int coh901318_config(struct coh901318_chan *cohc, +@@ -1836,8 +1834,6 @@ static int coh901318_config(struct coh90 coh901318_set_conf(cohc, p->config); coh901318_set_ctrl(cohc, p->ctrl_lli_last); @@ -46,6 +45,3 @@ index c340ca9bd2b5d..69852a99fc243 100644 return 0; } --- -2.20.1 - diff --git a/queue-4.4/dmaengine-coh901318-remove-unused-variable.patch b/queue-4.4/dmaengine-coh901318-remove-unused-variable.patch new file mode 100644 index 00000000000..de447115eb6 --- /dev/null +++ b/queue-4.4/dmaengine-coh901318-remove-unused-variable.patch @@ -0,0 +1,36 @@ +From 35faaf0df42d285b40f8a6310afbe096720f7758 Mon Sep 17 00:00:00 2001 +From: Vinod Koul +Date: Mon, 26 Nov 2018 13:34:15 +0530 +Subject: dmaengine: coh901318: Remove unused variable + +From: Vinod Koul + +commit 35faaf0df42d285b40f8a6310afbe096720f7758 upstream. + +Commit 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug") left +flags variable unused, so remove it to fix the warning. + +drivers/dma/coh901318.c: In function 'coh901318_config': +drivers/dma/coh901318.c:1805:16: warning: unused variable 'flags' [-Wunused-variable] + unsigned long flags; + ^~~~~ + +Fixes: 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug") +Reported-By: Stephen Rothwell +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/dma/coh901318.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/dma/coh901318.c ++++ b/drivers/dma/coh901318.c +@@ -1810,7 +1810,6 @@ static struct dma_chan *coh901318_xlate( + static int coh901318_config(struct coh901318_chan *cohc, + struct coh901318_params *param) + { +- unsigned long flags; + const struct coh901318_params *p; + int channel = cohc->id; + void __iomem *virtbase = cohc->base->virtbase; diff --git a/queue-4.4/series b/queue-4.4/series index 1c86921cec6..cad2ce50014 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -29,6 +29,7 @@ rtc-dt-binding-abx80x-fix-resistance-scale.patch arm-dts-exynos-use-samsung-soc-specific-compatible-f.patch media-coda-fix-memory-corruption-in-case-more-than-3.patch dmaengine-coh901318-fix-a-double-lock-bug.patch +dmaengine-coh901318-remove-unused-variable.patch acpi-fix-acpi_find_child_device-invocation-in-acpi_p.patch dma-mapping-fix-return-type-of-dma_set_max_seg_size.patch altera-stapl-check-for-a-null-key-before-strcasecmp-.patch