lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@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);
That one makes sense.

Cheers,
Samuel.


\
 
 \ /
  Last update: 2015-03-26 01:41    [W:0.336 / U:0.324 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site