diff options
| author | Vinod Koul | 2013-09-02 14:12:35 +0200 |
|---|---|---|
| committer | Vinod Koul | 2013-09-02 14:12:35 +0200 |
| commit | 265d9c673d47fcd5812d69dc07104b706285de56 (patch) | |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 /drivers/dma/sh/shdma-of.c | |
| parent | Merge branch 'topic/of' into for-linus (diff) | |
| parent | DMA: shdma: fix a bad merge - remove free_irq() (diff) | |
| download | kernel-qcow2-linux-265d9c673d47fcd5812d69dc07104b706285de56.tar.gz kernel-qcow2-linux-265d9c673d47fcd5812d69dc07104b706285de56.tar.xz kernel-qcow2-linux-265d9c673d47fcd5812d69dc07104b706285de56.zip | |
Merge branch 'topic/sh' into for-linus
Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/sh/shdma-of.c')
| -rw-r--r-- | drivers/dma/sh/shdma-of.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c index 966aaab0b4d3..06473a05fe4e 100644 --- a/drivers/dma/sh/shdma-of.c +++ b/drivers/dma/sh/shdma-of.c @@ -45,9 +45,6 @@ static int shdma_of_probe(struct platform_device *pdev) const struct of_dev_auxdata *lookup = dev_get_platdata(&pdev->dev); int ret; - if (!lookup) - return -EINVAL; - ret = of_dma_controller_register(pdev->dev.of_node, shdma_of_xlate, pdev); if (ret < 0) |