Commit 12b25dbf authored Apr 08, 2014 by Clement Perrochaud Committed by Samuel Ortiz Apr 22, 2014

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>

parent 742b1f9f

drivers/nfc/pn544/i2c.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1029,8 +1029,12 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
		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;
		}