Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm

OMAP PM related fixes for v3.7-rc

6 files changed, 9 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 68ff8d51973..79d4820b291 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -461,7 +461,7 @@ static void __init beagle_opp_init(void)
                 mpu_dev = omap_device_get_by_hwmod_name("mpu");
                 iva_dev = omap_device_get_by_hwmod_name("iva");
 
-                if (!mpu_dev || !iva_dev) {
+                if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) {
                         pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n",
                                 __func__, mpu_dev, iva_dev);
                         return;
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index abefbc4d8e0..1e40afe7ed3 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -177,7 +177,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
         }
 
         voltdm = voltdm_lookup(vdd_name);
-        if (IS_ERR(voltdm)) {
+        if (!voltdm) {
                 pr_err("%s: unable to get vdd pointer for vdd_%s\n",
                         __func__, vdd_name);
                 goto exit;
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c
index cbeae56b56a..f8217a5a4a2 100644
--- a/arch/arm/mach-omap2/sr_device.c
+++ b/arch/arm/mach-omap2/sr_device.c
@@ -122,7 +122,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
         sr_data->senp_mod = 0x1;
 
         sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name);
-        if (IS_ERR(sr_data->voltdm)) {
+        if (!sr_data->voltdm) {
                 pr_err("%s: Unable to get voltage domain pointer for VDD %s\n",
                         __func__, sr_dev_attr->sensor_voltdm_name);
                 goto exit;
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index ca83a7659ae..d30f480ccd1 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -48,6 +48,7 @@ config OMAP_DEBUG_LEDS
 config POWER_AVS_OMAP
         bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"
         depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM
+        select POWER_SUPPLY
         help
           Say Y to enable AVS(Adaptive Voltage Scaling)
           support on OMAP containing the version 1 or
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index cee85a55bd8..7a7d1f2a65e 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -725,7 +725,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p
                 dev_set_name(&pdev->dev, "%s", pdev->name);
 
         od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt);
-        if (!od)
+        if (IS_ERR(od))
                 goto odbs_exit1;
 
         ret = platform_device_add_data(pdev, pdata, pdata_len);
diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index d4957b4edb6..24768a27e1d 100644
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -930,7 +930,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
         if (!sr_info->base) {
                 dev_err(&pdev->dev, "%s: ioremap fail\n", __func__);
                 ret = -ENOMEM;
-                goto err_release_region;
+                goto err_free_name;
         }
 
         if (irq)
@@ -969,7 +969,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n",
                         __func__);
                 ret = PTR_ERR(sr_info->dbg_dir);
-                goto err_free_name;
+                goto err_debugfs;
         }
 
         (void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR,
@@ -1013,11 +1013,11 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 
 err_debugfs:
         debugfs_remove_recursive(sr_info->dbg_dir);
-err_free_name:
-        kfree(sr_info->name);
 err_iounmap:
         list_del(&sr_info->node);
         iounmap(sr_info->base);
+err_free_name:
+        kfree(sr_info->name);
 err_release_region:
         release_mem_region(mem->start, resource_size(mem));
 err_free_devinfo: