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:
Родитель
2c376a9e3c
Коммит
df2566fe37
|
@ -94,24 +94,19 @@ 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;
|
||||
if (r) {
|
||||
pr_err("Cannot register nfc device to nci core\n");
|
||||
nci_free_device(ndlc->ndev);
|
||||
}
|
||||
|
||||
return r;
|
||||
err_regdev:
|
||||
nci_free_device(ndlc->ndev);
|
||||
|
||||
err_alloc_ndev:
|
||||
kfree(info);
|
||||
return r;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(st21nfcb_nci_probe);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче