LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Robert Dolca <robert.dolca@intel.com>
To: linux-nfc@ml01.01.org,
	Lauro Ramos Venancio <lauro.venancio@openbossa.org>,
	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>,
	Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
	netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
	Robert Dolca <robert.dolca@intel.com>
Subject: [PATCH 5/8] NFC: NCI: Don't call setup if previous NCI request failed
Date: Tue, 24 Feb 2015 12:01:49 +0200	[thread overview]
Message-ID: <1424772112-27399-6-git-send-email-robert.dolca@intel.com> (raw)
In-Reply-To: <1424772112-27399-1-git-send-email-robert.dolca@intel.com>

If the previous nci_request (NCI reset) failed the setup function
was being called anyway. It shouldn't be called if the reset failed.

The result of the setup function is taken into consideration. If it
fails the init should fail.

Signed-off-by: Robert Dolca <robert.dolca@intel.com>
---
 net/nfc/nci/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 1a449ac..d2e7adf 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -365,8 +365,8 @@ 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,
-- 
1.9.1


  parent reply	other threads:[~2015-02-24 10:02 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-24 10:01 [PATCH 0/8] Adds Intel FieldsPeak NFC solution driver Robert Dolca
2015-02-24 10:01 ` [PATCH 1/8] NFC: NCI: Allow connection close with dev down Robert Dolca
2015-03-26  0:29   ` Samuel Ortiz
2015-03-31 14:03     ` [linux-nfc] " Robert Dolca
2015-05-24 17:07       ` Samuel Ortiz
2015-08-28 14:05         ` Robert Dolca
2015-02-24 10:01 ` [PATCH 2/8] NFC: NCI: Exporting NFC command and data send API Robert Dolca
2015-02-24 10:01 ` [PATCH 3/8] NFC: NCI: Adds NCI init and reset API for drivers Robert Dolca
2015-03-26  0:29   ` Samuel Ortiz
2015-03-31 14:05     ` [linux-nfc] " Robert Dolca
2015-05-24 17:07       ` Samuel Ortiz
2015-02-24 10:01 ` [PATCH 4/8] NFC: NCI: Add a special nci_request for driver Robert Dolca
2015-03-26  0:29   ` Samuel Ortiz
2015-03-31 14:07     ` [linux-nfc] " Robert Dolca
2015-02-24 10:01 ` Robert Dolca [this message]
2015-03-26  0:29   ` [PATCH 5/8] NFC: NCI: Don't call setup if previous NCI request failed Samuel Ortiz
2015-02-24 10:01 ` [PATCH 6/8] NFC: NCI: Add function to get max packet size for conn Robert Dolca
2015-02-24 10:01 ` [PATCH 7/8] NFC: NCI: Adds a way to get the new connection ID Robert Dolca
2015-02-24 10:01 ` [PATCH 8/8] NFC: Add Intel FieldsPeak NFC solution driver Robert Dolca
2015-02-24 10:33   ` Johannes Berg
2015-02-24 10:46     ` Robert Dolca
2015-03-26  0:30   ` Samuel Ortiz
2015-04-01 15:35     ` [linux-nfc] " Robert Dolca
2015-05-24 17:08       ` Samuel Ortiz
2015-03-26 11:20   ` Samuel Ortiz
2015-03-26 13:45   ` Mika Westerberg
2015-02-24 16:14 ` [PATCH 0/8] Adds " Greg Rose
2015-02-24 16:25   ` Daniel Baluta
2015-02-24 16:27     ` Greg Rose

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424772112-27399-6-git-send-email-robert.dolca@intel.com \
    --to=robert.dolca@intel.com \
    --cc=aloisio.almeida@openbossa.org \
    --cc=davem@davemloft.net \
    --cc=lauro.venancio@openbossa.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfc@ml01.01.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    --subject='Re: [PATCH 5/8] NFC: NCI: Don'\''t call setup if previous NCI request failed' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).