git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
pm_bus.c
diff --git
a/arch/arm/mach-omap1/pm_bus.c
b/arch/arm/mach-omap1/pm_bus.c
index
8b66392
..
6588c22
100644
(file)
--- a/
arch/arm/mach-omap1/pm_bus.c
+++ b/
arch/arm/mach-omap1/pm_bus.c
@@
-48,7
+48,6
@@
static int omap1_pm_runtime_suspend(struct device *dev)
static int omap1_pm_runtime_resume(struct device *dev)
{
static int omap1_pm_runtime_resume(struct device *dev)
{
- int ret = 0;
struct clk *iclk, *fclk;
dev_dbg(dev, "%s\n", __func__);
struct clk *iclk, *fclk;
dev_dbg(dev, "%s\n", __func__);
@@
-73,6
+72,9
@@
static int __init omap1_pm_runtime_init(void)
const struct dev_pm_ops *pm;
struct dev_pm_ops *omap_pm;
const struct dev_pm_ops *pm;
struct dev_pm_ops *omap_pm;
+ if (!cpu_class_is_omap1())
+ return -ENODEV;
+
pm = platform_bus_get_pm_ops();
if (!pm) {
pr_err("%s: unable to get dev_pm_ops from platform_bus\n",
pm = platform_bus_get_pm_ops();
if (!pm) {
pr_err("%s: unable to get dev_pm_ops from platform_bus\n",