diff options
Diffstat (limited to 'drivers/dma/sh')
-rw-r--r-- | drivers/dma/sh/shdma-base.c | 3 | ||||
-rw-r--r-- | drivers/dma/sh/shdma.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index f4cd946d259d..4acb85a10250 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c | |||
@@ -638,9 +638,6 @@ static int shdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | |||
638 | unsigned long flags; | 638 | unsigned long flags; |
639 | int ret; | 639 | int ret; |
640 | 640 | ||
641 | if (!chan) | ||
642 | return -EINVAL; | ||
643 | |||
644 | switch (cmd) { | 641 | switch (cmd) { |
645 | case DMA_TERMINATE_ALL: | 642 | case DMA_TERMINATE_ALL: |
646 | spin_lock_irqsave(&schan->chan_lock, flags); | 643 | spin_lock_irqsave(&schan->chan_lock, flags); |
diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c index 3315e4be9b85..b70709b030d8 100644 --- a/drivers/dma/sh/shdma.c +++ b/drivers/dma/sh/shdma.c | |||
@@ -326,7 +326,7 @@ static int sh_dmae_set_slave(struct shdma_chan *schan, | |||
326 | shdma_chan); | 326 | shdma_chan); |
327 | const struct sh_dmae_slave_config *cfg = dmae_find_slave(sh_chan, slave_id); | 327 | const struct sh_dmae_slave_config *cfg = dmae_find_slave(sh_chan, slave_id); |
328 | if (!cfg) | 328 | if (!cfg) |
329 | return -ENODEV; | 329 | return -ENXIO; |
330 | 330 | ||
331 | if (!try) | 331 | if (!try) |
332 | sh_chan->config = cfg; | 332 | sh_chan->config = cfg; |