[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1499951210-6283-1-git-send-email-ganeshgr@chelsio.com>
Date: Thu, 13 Jul 2017 18:36:50 +0530
From: Ganesh Goudar <ganeshgr@...lsio.com>
To: netdev@...r.kernel.org, davem@...emloft.net
Cc: atul.gupta@...lsio.com, nirranjan@...lsio.com,
indranil@...lsio.com, dan.carpenter@...cle.com,
Ganesh Goudar <ganeshgr@...lsio.com>,
Richard Cochran <richardcochran@...il.com>
Subject: [PATCH net v2] cxgb4: ptp_clock_register() returns error pointers
Check ptp_clock_register() return not only for NULL but
also for error pointers, and also nullify adapter->ptp_clock
if ptp_clock_register() fails.
Fixes: 9c33e4208bce ("cxgb4: Add PTP Hardware Clock (PHC) support")
Reported-by: Dan Carpenter <dan.carpenter@...cle.com>
Cc: Richard Cochran <richardcochran@...il.com>
Signed-off-by: Ganesh Goudar <ganeshgr@...lsio.com>
---
v2: nullifying adapter->ptp_clock if ptp_clock_register() fails.
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
index 50517cf..9f9d6ca 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
@@ -441,7 +441,8 @@ void cxgb4_ptp_init(struct adapter *adapter)
adapter->ptp_clock = ptp_clock_register(&adapter->ptp_clock_info,
&adapter->pdev->dev);
- if (!adapter->ptp_clock) {
+ if (IS_ERR_OR_NULL(adapter->ptp_clock)) {
+ adapter->ptp_clock = NULL;
dev_err(adapter->pdev_dev,
"PTP %s Clock registration has failed\n", __func__);
return;
--
2.1.0
Powered by blists - more mailing lists