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)