diff options
| author | Clement Perrochaud <clement.perrochaud@nxp.com> | 2014-04-08 13:13:49 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-04-22 00:37:29 +0200 |
| commit | 12b25dbf119337ce51dc93e5ecd7cbe891877328 (patch) | |
| tree | 5637d0a50d2fba4b72e15d7c5e206768837dc7d3 /drivers/nfc | |
| parent | NFC: trf7970a: Add support for the ISO/IEC 14443-B and Type 4B tags (diff) | |
| download | linux-12b25dbf119337ce51dc93e5ecd7cbe891877328.tar.xz linux-12b25dbf119337ce51dc93e5ecd7cbe891877328.zip | |
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>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/pn544/i2c.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index 5239e3b54120..440291ab7263 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -1029,8 +1029,12 @@ err_hci: 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; } |