sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source 
From Kevin Hilman <khilman@deeprootsystems.com> via Tony Lindgren:

OMAP PM related fixes for v3.7-rc

* tag 'omap-for-v3.7-rc1/fixes-pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: SmartReflex: fix error path in init function
  ARM: OMAP: SmartReflex: select CONFIG_POWER_SUPPLY in Kconfig
  ARM: OMAP2+: PM: fix return value check in omap2_set_init_voltage()
  ARM: OMAP2+: SmartReflex: fix return value check in sr_dev_init()
  ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()
  ARM: OMAP: fix return value check in beagle_opp_init()
This commit is contained in:
Olof Johansson
2012-10-09 14:05:11 -07:00
parent aa8bd5969e fce680e9fa
commit ccd7e49c24
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-omap3beagle.c
View File

@@ -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;

2
arch/arm/mach-omap2/pm.c
View File

@@ -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;

2
arch/arm/mach-omap2/sr_device.c
View File

@@ -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;