diff --git a/[refs] b/[refs]
index f0cedc2af397..5befa8048c68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed30933e6f3dbeaaab1de91e1bec25f42d5d32df
+refs/heads/master: 855372c013bbad8369223f7c75242bd3c94f9345
diff --git a/trunk/drivers/dma/sh/shdma-base.c b/trunk/drivers/dma/sh/shdma-base.c
index f4cd946d259d..4acb85a10250 100644
--- a/trunk/drivers/dma/sh/shdma-base.c
+++ b/trunk/drivers/dma/sh/shdma-base.c
@@ -638,9 +638,6 @@ static int shdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	unsigned long flags;
 	int ret;
 
-	if (!chan)
-		return -EINVAL;
-
 	switch (cmd) {
 	case DMA_TERMINATE_ALL:
 		spin_lock_irqsave(&schan->chan_lock, flags);