From patchwork Sun May 2 15:44:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 96363 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o42FjKUG001763 for ; Sun, 2 May 2010 15:45:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756783Ab0EBPpS (ORCPT ); Sun, 2 May 2010 11:45:18 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:61422 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755370Ab0EBPpR (ORCPT ); Sun, 2 May 2010 11:45:17 -0400 Received: by mail-bw0-f219.google.com with SMTP id 19so900064bwz.21 for ; Sun, 02 May 2010 08:45:17 -0700 (PDT) Received: by 10.204.2.139 with SMTP id 11mr938701bkj.202.1272815116847; Sun, 02 May 2010 08:45:16 -0700 (PDT) Received: from localhost.localdomain (93-172-184-4.bb.netvision.net.il [93.172.184.4]) by mx.google.com with ESMTPS id 13sm1356236bwz.15.2010.05.02.08.45.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 02 May 2010 08:45:16 -0700 (PDT) From: Ohad Ben-Cohen To: Cc: Kanigeri Hari , Hiroshi Doyu , Ohad Ben-Cohen Subject: [PATCH v2 3/4] omap: mailbox: fix reverse likeliness Date: Sun, 2 May 2010 18:44:30 +0300 Message-Id: <1272815071-2827-4-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1272815071-2827-1-git-send-email-ohad@wizery.com> References: <1272815071-2827-1-git-send-email-ohad@wizery.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 02 May 2010 15:45:20 +0000 (UTC) diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index 5140efc..5309213 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -290,7 +290,7 @@ static int omap_mbox_startup(struct omap_mbox *mbox) fail_alloc_txq: free_irq(mbox->irq, mbox); fail_request_irq: - if (unlikely(mbox->ops->shutdown)) + if (likely(mbox->ops->shutdown)) mbox->ops->shutdown(mbox); return ret; @@ -303,7 +303,7 @@ static void omap_mbox_fini(struct omap_mbox *mbox) free_irq(mbox->irq, mbox); - if (unlikely(mbox->ops->shutdown)) { + if (likely(mbox->ops->shutdown)) { spin_lock(&mboxes_lock); if (mbox_configured > 0) mbox_configured--;