From: Amitkumar Karwar <akarwar@marvell.com>
Date: Thu, 6 Feb 2014 19:28:31 +0000 (-0800)
Subject: NFC: NCI: Fix NULL pointer dereference
X-Git-Tag: upstream/snapshot3+hdmi~3264^2~21^2^2~16^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44a589ca2de4d7980f8b335481a09bf818065dbe;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

NFC: NCI: Fix NULL pointer dereference

The check should be for setup function pointer.

This patch fixes NULL pointer dereference issue for NCI
based NFC driver which doesn't define setup handler.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 46bda01..56db888 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -301,7 +301,7 @@ 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))
+	if (ndev->ops->setup)
 		ndev->ops->setup(ndev);
 
 	if (!rc) {