| Message ID | 1242302990-4104-1-git-send-email-tero.kristo@nokia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kevin Hilman |
| Headers | show |
Tero Kristo <tero.kristo@nokia.com> writes: > From: Tero Kristo <tero.kristo@nokia.com> > > Parameter check for this function was bugged. > > Applies on top of PM branch. > > Signed-off-by: Tero Kristo <tero.kristo@nokia.com> > Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com> Thanks, pushing to PM branch today. Kevin > 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 majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; };