From patchwork Thu May 14 12:09:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 23759 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4ECb6xI023714 for ; Thu, 14 May 2009 12:37:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759592AbZENMg0 (ORCPT ); Thu, 14 May 2009 08:36:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760482AbZENMgZ (ORCPT ); Thu, 14 May 2009 08:36:25 -0400 Received: from smtp.nokia.com ([192.100.122.233]:17031 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759592AbZENMgY (ORCPT ); Thu, 14 May 2009 08:36:24 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n4ECaJQw026236 for ; Thu, 14 May 2009 15:36:20 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 14 May 2009 15:36:22 +0300 Received: from mgw-int01.ntc.nokia.com ([172.21.143.96]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 14 May 2009 15:36:22 +0300 Received: from localhost.localdomain (sokoban.ntc.nokia.com [172.22.144.95]) by mgw-int01.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n4ECaKbB007538 for ; Thu, 14 May 2009 15:36:20 +0300 From: Tero Kristo To: linux-omap@vger.kernel.org Subject: [PATCH] OMAP: PM: Fixed omap_pm_set_min_bus_tput Date: Thu, 14 May 2009 15:09:50 +0300 Message-Id: <1242302990-4104-1-git-send-email-tero.kristo@nokia.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <> References: <> X-OriginalArrivalTime: 14 May 2009 12:36:22.0055 (UTC) FILETIME=[96680B70:01C9D490] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Tero Kristo Parameter check for this function was bugged. Applies on top of PM branch. Signed-off-by: Tero Kristo Signed-off-by: Jouni Hogander --- 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; };