summaryrefslogtreecommitdiffstats
path: root/drivers/base/power/clock_ops.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-09-04 15:07:35 +0200
committerArnd Bergmann <arnd@arndb.de>2012-09-04 15:07:35 +0200
commit3fbb96d275989c604b343b9e39aeea50386756e9 (patch)
tree6a066ece039f798f7d5a6b44453fc889e0e1cf8a /drivers/base/power/clock_ops.c
parent63487589bf96bfd3fb7d5531f2d966f29ffe397d (diff)
parent863e99a8c1ea2b0391491904297f57a0f6a1fdd6 (diff)
Merge branch 'cleanup/io-pci' into next/cleanup
The io-pci series has gained a merge to resolve a nontrivial conflict. * cleanup/io-pci: ARM: Fix ioremap() of address zero Also includes an update to Linux 3.6-rc3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/base/power/clock_ops.c')
-rw-r--r--drivers/base/power/clock_ops.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 869d7ff2227..eb78e9640c4 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -169,8 +169,7 @@ void pm_clk_init(struct device *dev)
*/
int pm_clk_create(struct device *dev)
{
- int ret = dev_pm_get_subsys_data(dev);
- return ret < 0 ? ret : 0;
+ return dev_pm_get_subsys_data(dev);
}
/**