1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 5dbc5946c4c3..a17553f7c028 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -26,6 +26,7 @@
 #include <linux/scatterlist.h>
 #include <linux/of.h>
 #include <linux/of_dma.h>
+#include <linux/err.h>
 
 #include "dmaengine.h"
 #define PL330_MAX_CHAN          8
@@ -2288,13 +2289,12 @@ static inline void fill_queue(struct dma_pl330_chan *pch)
 
                 /* If already submitted */
                 if (desc->status == BUSY)
-                        break;
+                        continue;
 
                 ret = pl330_submit_req(pch->pl330_chid,
                                                 &desc->req);
                 if (!ret) {
                         desc->status = BUSY;
-                        break;
                 } else if (ret == -EAGAIN) {
                         /* QFull or DMAC Dying */
                         break;
@@ -2904,9 +2904,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
         pi->mcbufsz = pdat ? pdat->mcbuf_sz : 0;
 
         res = &adev->res;
-        pi->base = devm_request_and_ioremap(&adev->dev, res);
-        if (!pi->base)
-                return -ENXIO;
+        pi->base = devm_ioremap_resource(&adev->dev, res);
+        if (IS_ERR(pi->base))
+                return PTR_ERR(pi->base);
 
         amba_set_drvdata(adev, pdmac);