2012-09-08 13:19:45

by Wei Yongjun

Subject: [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test

From: Wei Yongjun <[email protected]>

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 <[email protected]>
---
drivers/nfc/pn544_hci.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

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)

2012-09-19 00:26:39

by Samuel Ortiz

Subject: Re: [PATCH v3] NFC: pn544_hci: move the dereference below the NULL test

Hi Wei,

On Sat, Sep 08, 2012 at 09:19:44PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 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 <[email protected]>
> ---
> drivers/nfc/pn544_hci.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
Applied as well, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/