From patchwork Sat Sep 8 13:19:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1426661 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 588A040AB4 for ; Sat, 8 Sep 2012 13:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754233Ab2IHNUH (ORCPT ); Sat, 8 Sep 2012 09:20:07 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:48016 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753131Ab2IHNTp (ORCPT ); Sat, 8 Sep 2012 09:19:45 -0400 Received: by qcro28 with SMTP id o28so272921qcr.19 for ; Sat, 08 Sep 2012 06:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=aTMC08h5/69rLJuRyBGQcgaX9wxHh6cOlbqj/q2nw8c=; b=a6xzKMRg/RqI67SxVXPBOwZPanr2O6lJKJh7q+IKcUKznGgptiWamyQbbDtWdtyOwu x3LWDNhpR9Qt7uxMu2rfCia6v14QwGqFyEmvXDwh8meo/m1qyd58TD7ua8NfH4VbRDwL 3z0Wjg7CF1oAQ6kYxVOhXjCUx/qu5ECIVSGbyoc4+PcPMsF4FetE+D5LLdxmNI0+Vfui 2paxLtssmsB8hzN6Wnz7BE0cp6YJG9PCPv94zbAO7w8rv11peW/nCYhs35N+afWABXJc LucRwz17v27sPO70ty1zz5HZmnHdf1QeyNOsJE18SUtPCEacMc528CefdkImqSrnlaXa y5pQ== MIME-Version: 1.0 Received: by 10.224.178.4 with SMTP id bk4mr4649273qab.38.1347110384727; Sat, 08 Sep 2012 06:19:44 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Sat, 8 Sep 2012 06:19:44 -0700 (PDT) Date: Sat, 8 Sep 2012 21:19:44 +0800 Message-ID: Subject: [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test From: Wei Yongjun To: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com Cc: yongjun_wei@trendmicro.com.cn, linux-wireless@vger.kernel.org Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Wei Yongjun The dereference should be moved below the NULL test. spatch with a semantic match is used to found this. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun --- drivers/nfc/pn544_hci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" 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/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c index aa71807..e42b100 100644 --- a/drivers/nfc/pn544_hci.c +++ b/drivers/nfc/pn544_hci.c @@ -341,13 +341,16 @@ flush: static irqreturn_t pn544_hci_irq_thread_fn(int irq, void *dev_id) { struct pn544_hci_info *info = dev_id; - struct i2c_client *client = info->i2c_dev; + struct i2c_client *client; struct sk_buff *skb = NULL; int r; - BUG_ON(!info); - BUG_ON(irq != info->i2c_dev->irq); + if (!info || irq != info->i2c_dev->irq) { + WARN_ON_ONCE(1); + return IRQ_NONE; + } + client = info->i2c_dev; dev_dbg(&client->dev, "IRQ\n"); if (info->hard_fault != 0)