mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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>
This commit is contained in:
parent
2c376a9e3c
commit
df2566fe37
1 changed files with 5 additions and 10 deletions
|
@ -94,24 +94,19 @@ int st21nfcb_nci_probe(struct llt_ndlc *ndlc, int phy_headroom,
|
||||||
phy_headroom, phy_tailroom);
|
phy_headroom, phy_tailroom);
|
||||||
if (!ndlc->ndev) {
|
if (!ndlc->ndev) {
|
||||||
pr_err("Cannot allocate nfc ndev\n");
|
pr_err("Cannot allocate nfc ndev\n");
|
||||||
r = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto err_alloc_ndev;
|
|
||||||
}
|
}
|
||||||
info->ndlc = ndlc;
|
info->ndlc = ndlc;
|
||||||
|
|
||||||
nci_set_drvdata(ndlc->ndev, info);
|
nci_set_drvdata(ndlc->ndev, info);
|
||||||
|
|
||||||
r = nci_register_device(ndlc->ndev);
|
r = nci_register_device(ndlc->ndev);
|
||||||
if (r)
|
if (r) {
|
||||||
goto err_regdev;
|
pr_err("Cannot register nfc device to nci core\n");
|
||||||
|
nci_free_device(ndlc->ndev);
|
||||||
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
err_regdev:
|
|
||||||
nci_free_device(ndlc->ndev);
|
|
||||||
|
|
||||||
err_alloc_ndev:
|
|
||||||
kfree(info);
|
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(st21nfcb_nci_probe);
|
EXPORT_SYMBOL_GPL(st21nfcb_nci_probe);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue