[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150326002956.GD10954@ribalta.home>
Date: Thu, 26 Mar 2015 01:29:56 +0100
From: Samuel Ortiz <sameo@...ux.intel.com>
To: Robert Dolca <robert.dolca@...el.com>
Cc: linux-nfc@...ts.01.org,
Lauro Ramos Venancio <lauro.venancio@...nbossa.org>,
Aloisio Almeida Jr <aloisio.almeida@...nbossa.org>,
linux-kernel@...r.kernel.org, linux-wireless@...r.kernel.org,
netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>
Subject: Re: [PATCH 5/8] NFC: NCI: Don't call setup if previous NCI request
failed
Hi Robert,
On Tue, Feb 24, 2015 at 12:01:49PM +0200, Robert Dolca wrote:
> 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@...el.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);
That one makes sense.
Cheers,
Samuel.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists