UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP2+: Return correct error values from device and hwmod 

Without this patch function pm_runtime_get_sync() returns 0 even when
some omap subfunction fails. This patch properly propagate error codes
from omap functions back to caller.

This patch fix problem, when loading omap-aes driver in qemu cause
kernel oops.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
[paul@pwsan.com: fix a checkpatch warning]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Pali Rohár 2015-02-26 14:49:51 +01:00 committed by Paul Walmsley
parent fabbe6df13
commit 6da233589f
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/mach-omap2/omap_device.c
View File

@ -224,13 +224,13 @@ static int _omap_device_notifier_call(struct notifier_block *nb,
*/
static int _omap_device_enable_hwmods(struct omap_device *od)
{
int ret = 0;
int i;
for (i = 0; i < od->hwmods_cnt; i++)
omap_hwmod_enable(od->hwmods[i]);
ret |= omap_hwmod_enable(od->hwmods[i]);
/* XXX pass along return value here? */
return 0;
return ret;
}
/**
@ -241,13 +241,13 @@ static int _omap_device_enable_hwmods(struct omap_device *od)
*/
static int _omap_device_idle_hwmods(struct omap_device *od)
{
int ret = 0;
int i;
for (i = 0; i < od->hwmods_cnt; i++)
omap_hwmod_idle(od->hwmods[i]);
ret |= omap_hwmod_idle(od->hwmods[i]);
/* XXX pass along return value here? */
return 0;
return ret;
}
/* Public functions for use by core code */
@ -595,18 +595,20 @@ static int _od_runtime_suspend(struct device *dev)
int ret;
ret = pm_generic_runtime_suspend(dev);
if (ret)
return ret;
if (!ret)
omap_device_idle(pdev);
return ret;
return omap_device_idle(pdev);
}
static int _od_runtime_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
int ret;
omap_device_enable(pdev);
ret = omap_device_enable(pdev);
if (ret)
return ret;
return pm_generic_runtime_resume(dev);
}
@ -743,7 +745,8 @@ int omap_device_enable(struct platform_device *pdev)
ret = _omap_device_enable_hwmods(od);
od->_state = OMAP_DEVICE_STATE_ENABLED;
if (ret == 0)
od->_state = OMAP_DEVICE_STATE_ENABLED;
return ret;
}
@ -773,7 +776,8 @@ int omap_device_idle(struct platform_device *pdev)
ret = _omap_device_idle_hwmods(od);
od->_state = OMAP_DEVICE_STATE_IDLE;
if (ret == 0)
od->_state = OMAP_DEVICE_STATE_IDLE;
return ret;
}

10
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -3318,16 +3318,17 @@ int omap_hwmod_enable(struct omap_hwmod *oh)
*/
int omap_hwmod_idle(struct omap_hwmod *oh)
{
int r;
unsigned long flags;
if (!oh)
return -EINVAL;
spin_lock_irqsave(&oh->_lock, flags);
_idle(oh);
r = _idle(oh);
spin_unlock_irqrestore(&oh->_lock, flags);
return 0;
return r;
}
/**
@ -3340,16 +3341,17 @@ int omap_hwmod_idle(struct omap_hwmod *oh)
*/
int omap_hwmod_shutdown(struct omap_hwmod *oh)
{
int r;
unsigned long flags;
if (!oh)
return -EINVAL;
spin_lock_irqsave(&oh->_lock, flags);
_shutdown(oh);
r = _shutdown(oh);
spin_unlock_irqrestore(&oh->_lock, flags);
return 0;
return r;
}
/*