commit 12b25dbf119337ce51dc93e5ecd7cbe891877328
author Clement Perrochaud <clement.perrochaud@nxp.com> Tue Apr 08 11:13:49 2014 +0000
committer Samuel Ortiz <sameo@linux.intel.com> Tue Apr 22 00:37:29 2014 +0200
tree 5637d0a50d2fba4b72e15d7c5e206768837dc7d3
parent 742b1f9fa292a1b8f5c8368464e114c9b71c2a81

NFC: pn544_i2c: Fix null pointer exception when not using platform data

Fixes a null pointer exception occurring when the IRQ request in
pn544_hci_i2c_probe fails and no platform data is available.

Signed-off-by: Clément Perrochaud <clement.perrochaud@nxp.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

drivers/nfc/pn544/i2c.c

diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 5239e3b5..440291a 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -1029,8 +1029,12 @@
 	free_irq(client->irq, phy);
 
 err_rti:
-	if (pdata->free_resources != NULL)
+	if (!pdata) {
+		gpio_free(phy->gpio_en);
+		gpio_free(phy->gpio_fw);
+	} else if (pdata->free_resources) {
 		pdata->free_resources();
+	}
 
 	return r;
 }