|
@@ -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
|
|
@@ -2903,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);
|
|
|
|