lkml.org 
[lkml]   [2015]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] NFC: NCI: Don't call setup if previous NCI request failed
    Date
    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


    \
     
     \ /
      Last update: 2015-02-24 11:21    [W:3.857 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site