Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / drivers / dma / moxart-dma.c

diff --git a/drivers/dma/moxart-dma.c b/drivers/dma/moxart-dma.c
index 631c4435e075f25d39c6041a523710495d1bfd8d..a6e642792e5a34f1bb46e738e416a49cd3fcc442 100644 (file)
--- a/drivers/dma/moxart-dma.c
+++ b/drivers/dma/moxart-dma.c
@@ -148,6 +148,7 @@ struct moxart_chan {
 struct moxart_dmadev {
        struct dma_device               dma_slave;
        struct moxart_chan              slave_chans[APB_DMA_MAX_CHANNEL];
+       unsigned int                    irq;
 };
 
 struct moxart_filter_data {
@@ -574,10 +575,8 @@ static int moxart_probe(struct platform_device *pdev)
        struct moxart_dmadev *mdc;
 
        mdc = devm_kzalloc(dev, sizeof(*mdc), GFP_KERNEL);
-       if (!mdc) {
-               dev_err(dev, "can't allocate DMA container\n");
+       if (!mdc)
                return -ENOMEM;
-       }
 
        irq = irq_of_parse_and_map(node, 0);
        if (irq == NO_IRQ) {
@@ -617,6 +616,7 @@ static int moxart_probe(struct platform_device *pdev)
                dev_err(dev, "devm_request_irq failed\n");
                return ret;
        }
+       mdc->irq = irq;
 
        ret = dma_async_device_register(&mdc->dma_slave);
        if (ret) {
@@ -640,6 +640,8 @@ static int moxart_remove(struct platform_device *pdev)
 {
        struct moxart_dmadev *m = platform_get_drvdata(pdev);
 
+       devm_free_irq(&pdev->dev, m->irq, m);
+
        dma_async_device_unregister(&m->dma_slave);
 
        if (pdev->dev.of_node)