diff options
| author | Wei Yongjun | 2012-09-08 21:19:44 +0800 |
|---|---|---|
| committer | Samuel Ortiz | 2012-09-25 00:17:26 +0200 |
| commit | c51ad34e542606854d0545533329e916689599ba (patch) | |
| tree | b75b57bf14c63014d427fe790fbea134154893f9 /drivers/nfc/pn544_hci.c | |
| parent | d6650a2ccfdcf536841c2f880a1a6f19fce2e3a1 (diff) | |
NFC: Move the pn544_hci dereference below the NULL test
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 <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/pn544_hci.c')
| -rw-r--r-- | drivers/nfc/pn544_hci.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c index e681da2e3413..7b0c2176e89b 100644 --- a/drivers/nfc/pn544_hci.c +++ b/drivers/nfc/pn544_hci.c @@ -346,13 +346,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) |