From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5922DC282CE for ; Mon, 22 Apr 2019 20:02:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 189FD2075A for ; Mon, 22 Apr 2019 20:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555963359; bh=bxwBi9xthscFx/8BWKpEfnRIk6UPXuG3S0uNBv4ah34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XpphpTfVJB5iVVH3tFLh1/LhsH85KY9exkHTaDTaEEliq2s4wb941XF1lhlep9yd7 lMK2YWvv3kb8XOoq/BTl1JZruGSSx9Y0ecL0uNUFOfaEbQW/6lYo9E9iJPxvCqLA5X 82naTK6fBA4FgsHkCZkgtLLslHOnk5YwWuy1eFTk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729578AbfDVTqj (ORCPT ); Mon, 22 Apr 2019 15:46:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:48924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728669AbfDVTqi (ORCPT ); Mon, 22 Apr 2019 15:46:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B65D1218B0; Mon, 22 Apr 2019 19:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962397; bh=bxwBi9xthscFx/8BWKpEfnRIk6UPXuG3S0uNBv4ah34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yxDvzh2DXVxm2W9itmkL8BXARJ1kqHpnxmZ+AzuRU0mj/FHof+aXxE4hcIgiRZ4s2 shILVXMOy3iTtml4c7MJ1RElWRXQdiQ+OFUiI/+0bfXE+86Ae+svzsc2/QgOgQFsnh mTM5S1jt2uJzj0pAlgB5e3zVrbJkwDYNNrVJoeg0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Harini Katakam , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 35/68] net: macb: Add null check for PCLK and HCLK Date: Mon, 22 Apr 2019 15:44:43 -0400 Message-Id: <20190422194516.11634-35-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194516.11634-1-sashal@kernel.org> References: <20190422194516.11634-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Harini Katakam [ Upstream commit cd5afa91f078c0787be0a62b5ef90301c00b0271 ] Both PCLK and HCLK are "required" clocks according to macb devicetree documentation. There is a chance that devm_clk_get doesn't return a negative error but just a NULL clock structure instead. In such a case the driver proceeds as usual and uses pclk value 0 to calculate MDC divisor which is incorrect. Hence fix the same in clock initialization. Signed-off-by: Harini Katakam Signed-off-by: David S. Miller Signed-off-by: Sasha Levin (Microsoft) --- drivers/net/ethernet/cadence/macb_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 8abea1c3844f..7d7b51383adf 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3323,14 +3323,20 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, *hclk = devm_clk_get(&pdev->dev, "hclk"); } - if (IS_ERR(*pclk)) { + if (IS_ERR_OR_NULL(*pclk)) { err = PTR_ERR(*pclk); + if (!err) + err = -ENODEV; + dev_err(&pdev->dev, "failed to get macb_clk (%u)\n", err); return err; } - if (IS_ERR(*hclk)) { + if (IS_ERR_OR_NULL(*hclk)) { err = PTR_ERR(*hclk); + if (!err) + err = -ENODEV; + dev_err(&pdev->dev, "failed to get hclk (%u)\n", err); return err; } -- 2.19.1