1 files changed, 3 insertions, 2 deletions

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 56d57c93ea1a..b900e6a2a284 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -347,8 +347,9 @@ 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,