diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-07-28 18:11:36 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-09-07 23:56:48 +0200 |
| commit | df2566fe37d92dfba032e6084ebfb708dac5dc9a (patch) | |
| tree | b8c4f3e6705a2576aeb1fcc9a0136e02f4975cd0 /drivers/nfc | |
| parent | 2c376a9e3c973e7923daba78aa16c768503cdef3 (diff) | |
| download | linux-df2566fe37d92dfba032e6084ebfb708dac5dc9a.tar.gz linux-df2566fe37d92dfba032e6084ebfb708dac5dc9a.tar.bz2 linux-df2566fe37d92dfba032e6084ebfb708dac5dc9a.zip | |
NFC: st21nfcb: Remove inappropriate kfree on a previously devm_kzalloc pointer
In case of an error during driver probe, info pointer was freed with kfree.
No need to free anything when using devm_kzalloc.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfcb/st21nfcb.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/nfc/st21nfcb/st21nfcb.c b/drivers/nfc/st21nfcb/st21nfcb.c index 4d95863e3063..64d2eaf40ef8 100644 --- a/drivers/nfc/st21nfcb/st21nfcb.c +++ b/drivers/nfc/st21nfcb/st21nfcb.c @@ -94,23 +94,18 @@ int st21nfcb_nci_probe(struct llt_ndlc *ndlc, int phy_headroom, phy_headroom, phy_tailroom); if (!ndlc->ndev) { pr_err("Cannot allocate nfc ndev\n"); - r = -ENOMEM; - goto err_alloc_ndev; + return -ENOMEM; } info->ndlc = ndlc; nci_set_drvdata(ndlc->ndev, info); r = nci_register_device(ndlc->ndev); - if (r) - goto err_regdev; - - return r; -err_regdev: - nci_free_device(ndlc->ndev); + if (r) { + pr_err("Cannot register nfc device to nci core\n"); + nci_free_device(ndlc->ndev); + } -err_alloc_ndev: - kfree(info); return r; } EXPORT_SYMBOL_GPL(st21nfcb_nci_probe); |