luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFC: nci: Add NCI_RESET return code check before setup

Browse Source 
setup was executed in any case, even if NCI_RESET failed.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Christophe Ricard 2015-06-06 13:16:39 +02:00 committed by Samuel Ortiz
parent b6355e972a
commit 81859ab877
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/nfc/nci/core.c
View File

@ -347,8 +347,9 @@ static int nci_open_device(struct nci_dev *ndev)
rc = __nci_request(ndev, nci_reset_req, 0, rc = __nci_request(ndev, nci_reset_req, 0,
msecs_to_jiffies(NCI_RESET_TIMEOUT)); msecs_to_jiffies(NCI_RESET_TIMEOUT));
if (ndev->ops->setup) if (!rc && ndev->ops->setup) {
ndev->ops->setup(ndev); rc = ndev->ops->setup(ndev);
}
if (!rc) { if (!rc) {
rc = __nci_request(ndev, nci_init_req, 0, rc = __nci_request(ndev, nci_init_req, 0,