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,