OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'soc-fixes' into omap-for-v4.15/fixes
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-omap2
/
omap_device.c
diff --git
a/arch/arm/mach-omap2/omap_device.c
b/arch/arm/mach-omap2/omap_device.c
index
184acd9
..
f038805
100644
(file)
--- a/
arch/arm/mach-omap2/omap_device.c
+++ b/
arch/arm/mach-omap2/omap_device.c
@@
-514,8
+514,10
@@
struct platform_device __init *omap_device_build(const char *pdev_name,
goto odbs_exit1;
od = omap_device_alloc(pdev, &oh, 1);
- if (IS_ERR(od))
+ if (IS_ERR(od)) {
+ ret = PTR_ERR(od);
goto odbs_exit1;
+ }
ret = platform_device_add_data(pdev, pdata, pdata_len);
if (ret)