netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robert Dolca <robert.dolca@intel.com>
To: linux-nfc@lists.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,
	Christophe Ricard <christophe.ricard@gmail.com>,
	Robert Dolca <robert.dolca@intel.com>
Subject: [PATCH v2 5/9] nfc: nci: Do not call post_setup when setup fails
Date: Tue,  1 Sep 2015 17:54:24 +0300	[thread overview]
Message-ID: <1441119268-30654-6-git-send-email-robert.dolca@intel.com> (raw)
In-Reply-To: <1441119268-30654-1-git-send-email-robert.dolca@intel.com>

The driver should know that it can continue with post setup where
setup left off. Being able to execute post_setup when setup fails may
force the developer to keep this state in the driver.

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

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index e2bd5f4..29607f9 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -402,9 +402,8 @@ static int nci_open_device(struct nci_dev *ndev)
 				   msecs_to_jiffies(NCI_INIT_TIMEOUT));
 	}
 
-	if (ndev->ops->post_setup) {
+	if (!rc && ndev->ops->post_setup)
 		rc = ndev->ops->post_setup(ndev);
-	}
 
 	if (!rc) {
 		rc = __nci_request(ndev, nci_init_complete_req, 0,
-- 
1.9.1

  parent reply	other threads:[~2015-09-01 14:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-01 14:54 [PATCH v2 0/9] Adds Intel FieldsPeak NFC solution driver Robert Dolca
2015-09-01 14:54 ` [PATCH v2 1/9] nfc: nci: Export nci data send API Robert Dolca
2015-09-01 14:54 ` [PATCH v2 2/9] nfc: nci: Add function to get max packet size for conn Robert Dolca
2015-09-01 14:54 ` [PATCH v2 4/9] nfc: nci: Allow the driver to set handler for core nci ops Robert Dolca
2015-09-01 14:54 ` Robert Dolca [this message]
2015-09-01 14:54 ` [PATCH v2 6/9] nfc: nci: Introduce nci_core_cmd Robert Dolca
2015-09-01 14:54 ` [PATCH v2 7/9] nfc: nci: Use a separate mutex for nci open and close Robert Dolca
     [not found] ` <1441119268-30654-1-git-send-email-robert.dolca-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-01 14:54   ` [PATCH v2 3/9] nfc: nci: Introduce new core opcodes Robert Dolca
2015-09-01 14:54   ` [PATCH v2 8/9] nfc: nci: Add a parameter to get the new connection id Robert Dolca
2015-09-01 14:54 ` [PATCH v2 9/9] nfc: Add Intel Fields Peak NFC solution driver Robert Dolca

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=1441119268-30654-6-git-send-email-robert.dolca@intel.com \
    --to=robert.dolca@intel.com \
    --cc=aloisio.almeida@openbossa.org \
    --cc=christophe.ricard@gmail.com \
    --cc=lauro.venancio@openbossa.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfc@lists.01.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).