Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Clement Perrochaud 2014-04-08 11:13:49 +00:00 committed by Samuel Ortiz
parent 742b1f9fa2
commit 12b25dbf11
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/nfc/pn544/i2c.c
View file

@ -1029,8 +1029,12 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
free_irq(client->irq, phy); free_irq(client->irq, phy);
err_rti: 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(); pdata->free_resources();
}
return r; return r;
} }