From: Tero Kristo <[email protected]> Parameter check for this function was bugged.
Applies on top of PM branch. Signed-off-by: Tero Kristo <[email protected]> Signed-off-by: Jouni Hogander <[email protected]> --- arch/arm/plat-omap/omap-pm-noop.c | 4 ++-- arch/arm/plat-omap/omap-pm-srf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c index 490bc8e..4ba261a 100644 --- a/arch/arm/plat-omap/omap-pm-noop.c +++ b/arch/arm/plat-omap/omap-pm-noop.c @@ -62,8 +62,8 @@ void omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t) void omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r) { - if (!dev || agent_id != OCP_INITIATOR_AGENT || - agent_id != OCP_TARGET_AGENT) { + if (!dev || (agent_id != OCP_INITIATOR_AGENT && + agent_id != OCP_TARGET_AGENT)) { WARN_ON(1); return; }; diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-pm-srf.c index 72e32de..226662d 100644 --- a/arch/arm/plat-omap/omap-pm-srf.c +++ b/arch/arm/plat-omap/omap-pm-srf.c @@ -76,8 +76,8 @@ void omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t) void omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r) { - if (!dev || agent_id != OCP_INITIATOR_AGENT || - agent_id != OCP_TARGET_AGENT) { + if (!dev || (agent_id != OCP_INITIATOR_AGENT && + agent_id != OCP_TARGET_AGENT)) { WARN_ON(1); return; }; -- 1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
