diff --git a/[refs] b/[refs]
index eb246ae5c573..3366a04148c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6650a2ccfdcf536841c2f880a1a6f19fce2e3a1
+refs/heads/master: c51ad34e542606854d0545533329e916689599ba
diff --git a/trunk/drivers/nfc/pn544_hci.c b/trunk/drivers/nfc/pn544_hci.c
index e681da2e3413..7b0c2176e89b 100644
--- a/trunk/drivers/nfc/pn544_hci.c
+++ b/trunk/drivers/nfc/pn544_hci.c
@@ -346,13 +346,16 @@ static int pn544_hci_i2c_read(struct i2c_client *client, struct sk_buff **skb)
 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)