Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp819194ybl; Wed, 4 Dec 2019 11:23:45 -0800 (PST) X-Google-Smtp-Source: APXvYqwqL84MJBcfI+VV9Xax3GwDBnnoTwaukkFKL2w5nWRa1L3td5oqIqeOzfhLIWBzJ+bLZdtr X-Received: by 2002:aca:889:: with SMTP id 131mr3898313oii.3.1575487425611; Wed, 04 Dec 2019 11:23:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575487425; cv=none; d=google.com; s=arc-20160816; b=Etx2PK/C1Ks/d+ctqv1uNNaeh02V2ClRrzHv89ZQvfNHOtOcCdb7+KSWgrbq3hshZY A3PIkSNrmeTe9kiZ1atXNuj/IRV8c0ak6uvxrIXeEyreTsmqRqMWqs1JyALNaTMd2Daw DKRwXbPPp3B3TKZuE9FfpKfDAmG/mryQne/hXmTsP/pNRYumdQ6LRPXtUJX7hKND6gR7 9v+CbSfr3Nq5v1YdRVEmVUoVNhb2UiI9NdUI3whVi8EMxvFIjvivUxe5fallVAJ34Qij vtBD7QNNT3fCfn9QVDkdGp1U5/Zq4pInWSTHQLERWSEtzShEUPBSGrReO2bxOVLUjfiu K+Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0l9jtkFAaeTm3hwNzPgQGIakl3Te6OgWpzI1ylvr5v0=; b=KOneM6NPHZnRdzmtupriptViPr6xQT/Fwmuc1BzM0ypKuCzHzvUFY2GkiFyUWfJ2s/ boVyj2rkd4ucQrYoEaaK89BbzWQoSSsXY42VjsPWPUvvThtR8HaKALUq9UlKtBoqdnkF DDtX8Y0c7co0On8/n4ppt7fB7yLDSKLUbBLplgyyA6FnkOq7i3OwZBaDH+1klufeS6vJ IunUzj0LBUncMdc25nysJjoFxLJJClIq4UxE4KRulM2zJVkxLPsSq2O8kM36bca09tFB kZv4GK4q+aif3J6uhUUnB2/Mg/WSK6NQXSMXkyOUcz2e3or9cQ+EWj30yE+pQaza4eaB y5Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GHnusgb1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 73si3558421otj.82.2019.12.04.11.23.25; Wed, 04 Dec 2019 11:23:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GHnusgb1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730414AbfLDSFh (ORCPT + 99 others); Wed, 4 Dec 2019 13:05:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:52376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730400AbfLDSFd (ORCPT ); Wed, 4 Dec 2019 13:05:33 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A492720833; Wed, 4 Dec 2019 18:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482733; bh=lm4JUrKaHoWWUev9vI4Y+B/zYy7vn/Rm5z1uWi8gAJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GHnusgb1kgvbmhFk1r9I9oFnlyYBLwyiZekhzxFpH2KhPFJidSMJ7FqWzl/GdRpsE XV8GEVL/ohQgRh+IcWS1Jzh0RWkqRqcHUGbEWsDnw6AvBhifqpUWVLl95iYC9XaM/m zPkEW7c12pzniO7wI/FsWUbk3kzmofIMoDsFq+dA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 113/209] net: (cpts) fix a missing check of clk_prepare Date: Wed, 4 Dec 2019 18:55:25 +0100 Message-Id: <20191204175330.787733040@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kangjie Lu [ Upstream commit 2d822f2dbab7f4c820f72eb8570aacf3f35855bd ] clk_prepare() could fail, so let's check its status, and if it fails, return its error code upstream. Signed-off-by: Kangjie Lu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/cpts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index e7b76f6b4f67e..7d1281d812480 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -567,7 +567,9 @@ struct cpts *cpts_create(struct device *dev, void __iomem *regs, return ERR_PTR(PTR_ERR(cpts->refclk)); } - clk_prepare(cpts->refclk); + ret = clk_prepare(cpts->refclk); + if (ret) + return ERR_PTR(ret); cpts->cc.read = cpts_systim_read; cpts->cc.mask = CLOCKSOURCE_MASK(32); -- 2.20.1