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 branch 'for-next' of git://github.com/rydberg/linux into next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
memory
/
tegra20-mc.c
diff --git
a/drivers/memory/tegra20-mc.c
b/drivers/memory/tegra20-mc.c
index 186f27d9e5f1ac25e2302f04bcedc1c656c19f4f..2ca5f2814f4a6ab317e995a6f6a3e404617350e2 100644
(file)
--- a/
drivers/memory/tegra20-mc.c
+++ b/
drivers/memory/tegra20-mc.c
@@
-17,6
+17,7
@@
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/ratelimit.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/ratelimit.h>
@@
-216,9
+217,9
@@
static int tegra20_mc_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, i);
if (!res)
return -ENODEV;
res = platform_get_resource(pdev, IORESOURCE_MEM, i);
if (!res)
return -ENODEV;
- mc->regs[i] = devm_
request_and_ioremap
(&pdev->dev, res);
- if (
!mc->regs[i]
)
- return
-EBUSY
;
+ mc->regs[i] = devm_
ioremap_resource
(&pdev->dev, res);
+ if (
IS_ERR(mc->regs[i])
)
+ return
PTR_ERR(mc->regs[i])
;
}
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
}
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);