Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

1 files changed, 2 insertions, 5 deletions

diff --git a/net/nfc/core.c b/net/nfc/core.c
index b675fa4a6f19..ca1e65f4b133 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -133,11 +133,8 @@ int nfc_dev_up(struct nfc_dev *dev)
                 dev->dev_up = true;
 
         /* We have to enable the device before discovering SEs */
-        if (dev->ops->discover_se) {
-                rc = dev->ops->discover_se(dev);
-                if (rc)
-                        pr_warn("SE discovery failed\n");
-        }
+        if (dev->ops->discover_se && dev->ops->discover_se(dev))
+                pr_err("SE discovery failed\n");
 
 error:
         device_unlock(&dev->dev);