projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
mmp_tdma.c
diff --git
a/drivers/dma/mmp_tdma.c
b/drivers/dma/mmp_tdma.c
index a9f1cd56689c06a1995aaca6ee53717ecc28a5e0..43d5a6c3329772e6680a908b2bfea2994c4fa9b0 100644
(file)
--- a/
drivers/dma/mmp_tdma.c
+++ b/
drivers/dma/mmp_tdma.c
@@
-9,6
+9,7
@@
*
*/
*
*/
+#include <linux/err.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
@@
-547,9
+548,9
@@
static int mmp_tdma_probe(struct platform_device *pdev)
if (!iores)
return -EINVAL;
if (!iores)
return -EINVAL;
- tdev->base = devm_
request_and_ioremap
(&pdev->dev, iores);
- if (
!tdev->base
)
- return
-EADDRNOTAVAIL
;
+ tdev->base = devm_
ioremap_resource
(&pdev->dev, iores);
+ if (
IS_ERR(tdev->base)
)
+ return
PTR_ERR(tdev->base)
;
INIT_LIST_HEAD(&tdev->device.channels);
INIT_LIST_HEAD(&tdev->device.channels);