|
@@ -15,6 +15,7 @@
|
|
#include <linux/io.h>
|
|
#include <linux/io.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/dma-mapping.h>
|
|
|
|
+#include <linux/err.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/interrupt.h>
|
|
@@ -1710,9 +1711,10 @@ static int pxa_camera_probe(struct platform_device *pdev)
|
|
/*
|
|
/*
|
|
* Request the regions.
|
|
* Request the regions.
|
|
*/
|
|
*/
|
|
- base = devm_request_and_ioremap(&pdev->dev, res);
|
|
|
|
- if (!base)
|
|
|
|
- return -ENOMEM;
|
|
|
|
|
|
+ base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
|
+ if (IS_ERR(base))
|
|
|
|
+ return PTR_ERR(base);
|
|
|
|
+
|
|
pcdev->irq = irq;
|
|
pcdev->irq = irq;
|
|
pcdev->base = base;
|
|
pcdev->base = base;
|
|
|
|
|