4.14-stable patches

added patches:
	dmaengine-coh901318-remove-unused-variable.patch

diff --git a/queue-4.14/dmaengine-coh901318-fix-a-double-lock-bug.patch b/queue-4.14/dmaengine-coh901318-fix-a-double-lock-bug.patch
index 0c3cc663dac10aae30e6635d634be1f6ec7b013e..0830ab6376b0ddcf6b24a402c8020b8c481890ca 100644 (file)
--- a/queue-4.14/dmaengine-coh901318-fix-a-double-lock-bug.patch
+++ b/queue-4.14/dmaengine-coh901318-fix-a-double-lock-bug.patch
@@ -20,15 +20,14 @@ Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
 Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
 Signed-off-by: Vinod Koul <vkoul@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 74794c9859f60..a8886abf0c75c 100644
 --- a/drivers/dma/coh901318.c
 +++ b/drivers/dma/coh901318.c
-@@ -1802,8 +1802,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
+@@ -1802,8 +1802,6 @@ static int coh901318_config(struct coh90
        int channel = cohc->id;
        void __iomem *virtbase = cohc->base->virtbase;
  
@@ -37,7 +36,7 @@ index 74794c9859f60..a8886abf0c75c 100644
        if (param)
                p = param;
        else
-@@ -1823,8 +1821,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
+@@ -1823,8 +1821,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 74794c9859f60..a8886abf0c75c 100644
        return 0;
  }
  
--- 
-2.20.1
-

diff --git a/queue-4.14/dmaengine-coh901318-remove-unused-variable.patch b/queue-4.14/dmaengine-coh901318-remove-unused-variable.patch
new file mode 100644 (file)
index 0000000..954132e
--- /dev/null
+++ b/queue-4.14/dmaengine-coh901318-remove-unused-variable.patch
@@ -0,0 +1,36 @@
+From 35faaf0df42d285b40f8a6310afbe096720f7758 Mon Sep 17 00:00:00 2001
+From: Vinod Koul <vkoul@kernel.org>
+Date: Mon, 26 Nov 2018 13:34:15 +0530
+Subject: dmaengine: coh901318: Remove unused variable
+
+From: Vinod Koul <vkoul@kernel.org>
+
+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 <sfr@canb.auug.org.au>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/dma/coh901318.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/dma/coh901318.c
++++ b/drivers/dma/coh901318.c
+@@ -1797,7 +1797,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.14/series b/queue-4.14/series
index 8aadfd9b8bb12c8218d3bc8cc85bbbaa4bec3a9f..9b08654e6f9090b76cf52b422e8bc222cdfba06d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -60,6 +60,7 @@ media-coda-fix-memory-corruption-in-case-more-than-3.patch
 media-pulse8-cec-return-0-when-invalidating-the-logi.patch
 media-cec-report-vendor-id-after-initialization.patch
 dmaengine-coh901318-fix-a-double-lock-bug.patch
+dmaengine-coh901318-remove-unused-variable.patch
 dmaengine-dw-dmac-implement-dma-protection-control-s.patch
 usb-dwc3-debugfs-properly-print-set-link-state-for-h.patch
 usb-dwc3-don-t-log-probe-deferrals-but-do-log-other-.patch