From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751553AbdB1SDh (ORCPT ); Tue, 28 Feb 2017 13:03:37 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:63111 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026AbdB1SDa (ORCPT ); Tue, 28 Feb 2017 13:03:30 -0500 From: Alban Bedel To: netdev@vger.kernel.org Cc: Iyappan Subramanian , Keyur Chudgar , linux-kernel@vger.kernel.org, Alban Bedel Subject: [PATCH] drivers: net: xgene: Fix crash on DT systems Date: Tue, 28 Feb 2017 18:08:55 +0100 Message-Id: <20170228170855.8123-1-alban.bedel@avionic-design.de> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K0:o4zsUUKlSbkk06e+nX6Nj6iPc1X+zPOFxM3yvpf8WjQnMetO6N6 Dt9kbbr+aeAk2nPN+Deh0CEsSOC88GSdRlQAtQpWNDHAYxShZi5T6f2ZmJJjxbgkftz+w/L Fh33b1bAC+GcIpQ2bTtiR6azmn/9VuzPDuJeeJPwf+OHxlbpNMakscGE7jRiaGcIKEXP/pn +WQTf57MXobkZHYachysg== X-UI-Out-Filterresults: notjunk:1;V01:K0:plUOrq1ZPks=:r7pVNShJrd+FWRrO2DiS85 KURPtsP8Qa60TXqNeWSJRTl7oO4Bp+Ye1lz+y7RSHW9b2siHOzn/9RVQXVkPKMgGxuNoUIVMT PkRrQEBXlf4zYUU2B3XO9S80Ol0QSQou6PaEUU5bPdBv/Ze21uxcQTIHGjOgqg1sWyKi4i6Ed rCHE/ZRTyDRHupopvjKP8v8fk49ZSt3pluqigkwYgeVfWX6nLGutW0BZ9BEPrCG8Pt2KDx9Sf b45Nr4lEoC02/Asb+koe0FvQmC7t9s4iHmzSBngbNElkNnB+aeiiP+ucNmXQUg57pk73sEQPW N2P0PJMcPG1ItAf1Lm0gHaQZqBpwzECV77pI1juqmLQ+980DdmLmextYDm/FIaR04HVYMASrx /MNCdtpTBA8MdT9SxwgXWesXI1fXB33T5HP6ZJYyjq3z1lmDCfvrpe9hqBmIeNt5z0i7ZBo6G d9L8MxPeMZcun11FAYgof48XNyCVNcyU/uGaO7kOSlKQkdOrM1S+p+bD2tLmpgY9gBNgDqGtr 6H1cHirB6fi7YJ7h+V0DCYJRMzbP5yHwELe836gnHIbJM1s7441yjmA6qjMk2LBUwewYPdT5q 4XGw4w5AycAca+/yZGPDRo4GQ8U9p9Uxjts+ZuR0KZ730S4q8pSqCWvRZdOO7ok6vJvwClexU 6xK7Y8VRzM8fkaqqfYS3Xc+AtAFsqfU2N591ACaZRgRgZEPd/Shhvko43oIPZf7s7do0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On DT systems the driver require a clock, but the probe just print a warning and continue, leading to a crash when resetting the device. To fix this crash and properly handle probe deferals only ignore the missing clock if DT isn't used or if the clock doesn't exist. Signed-off-by: Alban Bedel --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index d0d0d12b531f..68b48edc5921 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1756,6 +1756,12 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) pdata->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pdata->clk)) { + /* Abort if the clock is defined but couldn't be retrived. + * Always abort if the clock is missing on DT system as + * the driver can't cope with this case. + */ + if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node) + return PTR_ERR(pdata->clk); /* Firmware may have set up the clock already. */ dev_info(dev, "clocks have been setup already\n"); } -- 2.11.0