From patchwork Mon Sep 10 14:18:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1432371 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 72EFA40AB9 for ; Mon, 10 Sep 2012 14:18:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757403Ab2IJOSo (ORCPT ); Mon, 10 Sep 2012 10:18:44 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:63911 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757400Ab2IJOSX (ORCPT ); Mon, 10 Sep 2012 10:18:23 -0400 Received: by qcro28 with SMTP id o28so1007734qcr.19 for ; Mon, 10 Sep 2012 07:18:22 -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=pEA2lN9RobRzE3GxuRY0E63xU3DLpHDNzA+X53UI8Ec=; b=mGaPFMJ28D39FuoAJZcgp0GUqdJPBJm28WkXtM4t82YNqi4f1LboKDjaQJOMB0fwQh oqcpZZL828Q+FC2TUj4Y9+4rrpE9CHyHxOWPS3GUKtg66vBHWufFqUy2J9jl9mxrVvtU aPMxYTTwG3yvFGmaRZ5Ch9lE/5QiwfYhzNfbfNsakp/sXzzIzfR8jjHQQiQhIeBIN22M RN80lXRLNoMddDxLH28f3Ou8z1Yq+gUZ9Z7zoCy6xjFzD4EXpH1azqQxLLhRks8KSwix fjXnVLgFLhcB3zVNaCtFvvrEClfKOCDMDL6aul+30Z86qWFOFPl6vZYex6D5/y7UYioi Iypw== MIME-Version: 1.0 Received: by 10.224.184.20 with SMTP id ci20mr15909990qab.26.1347286702417; Mon, 10 Sep 2012 07:18:22 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Mon, 10 Sep 2012 07:18:22 -0700 (PDT) Date: Mon, 10 Sep 2012 22:18:22 +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, Larry.Finger@lwfinger.net, kvalo@adurom.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 | 10 +++++++--- 1 file changed, 7 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..ed3918c 100644 --- a/drivers/nfc/pn544_hci.c +++ b/drivers/nfc/pn544_hci.c @@ -341,13 +341,17 @@ 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 (WARN_ON_ONCE(!info)) + return IRQ_NONE; + + if (WARN_ON_ONCE(irq != info->i2c_dev->irq)) + return IRQ_NONE; + client = info->i2c_dev; dev_dbg(&client->dev, "IRQ\n"); if (info->hard_fault != 0)