Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81859ab8 authored Jun 06, 2015 by Christophe Ricard Committed by Samuel Ortiz Jun 09, 2015

NFC: nci: Add NCI_RESET return code check before setup



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>

parent b6355e97

net/nfc/nci/core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -347,8 +347,9 @@ static int nci_open_device(struct nci_dev *ndev)
		rc = __nci_request(ndev, nci_reset_req, 0,
		msecs_to_jiffies(NCI_RESET_TIMEOUT));

		if (ndev->ops->setup)
		ndev->ops->setup(ndev);
		if (!rc && ndev->ops->setup) {
		rc = ndev->ops->setup(ndev);
		}

		if (!rc) {
		rc = __nci_request(ndev, nci_init_req, 0,