From 063ab2473f684adb9e0da3c398902e7229df60fe Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Thu, 14 Feb 2013 11:00:16 +0200
Subject: [PATCH] --- yaml --- r: 358559 b: refs/heads/master c:
 978c4172af48f0adc082f8b1d94acb817d947730 h: refs/heads/master i:   358557:
 377584a616458a94845bf9c1a90b3656de2a9382   358555:
 ddaa3001c4df2f700645f92b38fd1c9cae6f3362   358551:
 2d7bd23b339be1371c1eb38727301ecd9df4f153   358543:
 73b1b25448e20a3943c0714db41ced0516c6d094   358527:
 25b9d4c43696eeab579a555ae272565aa4e9c6cf v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/dmaengine.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fc31ef0590f5..9e62639382cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88b386c0a7c278581d2b8e2c2761d12f6475938d
+refs/heads/master: 978c4172af48f0adc082f8b1d94acb817d947730
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index bfcdecb5d87a..f5939999cb65 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -610,8 +610,8 @@ static inline int dmaengine_device_control(struct dma_chan *chan,
 {
 	if (chan->device->device_control)
 		return chan->device->device_control(chan, cmd, arg);
-	else
-		return -ENOSYS;
+
+	return -ENOSYS;
 }
 
 static inline int dmaengine_slave_config(struct dma_chan *chan,