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 'sfi' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
pmu.c
diff --git
a/arch/arm/mach-omap2/pmu.c
b/arch/arm/mach-omap2/pmu.c
index 9ace8eae7ee8b1444aa9b0634764d2ad93871ecb..33c8846b419358693c634cca1c6b860f99c8fa6f 100644
(file)
--- a/
arch/arm/mach-omap2/pmu.c
+++ b/
arch/arm/mach-omap2/pmu.c
@@
-54,10
+54,7
@@
static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[])
WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n",
dev_name);
- if (IS_ERR(omap_pmu_dev))
- return PTR_ERR(omap_pmu_dev);
-
- return 0;
+ return PTR_RET(omap_pmu_dev);
}
static int __init omap_init_pmu(void)