From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1175177-1517178563-2-6636392981845085584 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517178562; b=OirbgxlttRjnS1t9G8IFowKRmBtJmchpXeQUK3oh1rxCZol IUtm7g8xfeLSFJQxnEdR71OQBzVRdJQkUg6v35BJcpi1WFpzXAzLVDiAF+OQBNRw xs4h2Ba3g6sN+DG0ZR+1J5qO8jU1uSa69GWnpPHFQo8nALxAuKoxOIgN8rQQM068 Xsc9B1EmSaPQgHbVy3pFq/GIOPeeUGPgYRjUZxA6dlecp5nxSHsYhN9Dbk99US1c N9c54qdinJNvmpQQ+j8XyA8MSZlcDQWo6G0YBHYSPA0/FyNQhqOuPQTNaY9uHbXU XPuqyC0aLsPeKAlQvF1rQUkOAqfEqHbSx+cTmrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517178562; bh=YiR1/C b/DkxgjKMpOqvLY8xoRJhUcgTH9u48HkVsHeo=; b=PvNm9o0sGWNyZOWXfeQhTI bDUL/qekWdoxCI8rZRkekQkOcdaA+S9yeXqLgYIx/DebRWi1q9XYQGcSsUod00Pl i+AJlPLy+cc3ScpuECrI5GTKoxjlFXOWHv7S52QJXubOymYyxRs3Or58xpk3kED7 eZ9A6wutcOjMg4JINx54pTapKWwKlqjD0t6OGnU1FscGLUYrV0B3079EUCjj1Xqv Dgkp7pmdopBes/w45DnlXgg57JALwonE5GhKPXW12cQOeUcrm5ijMIkYUQc+y/x8 ooypbC4KvDOzjpVh9TQZoTuQldc8ye5tvBzalA1OS9nCFuAZ70CSZ2jMeGkF/New == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=R9mEstYC x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=R9mEstYC x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932264AbeA1W3T (ORCPT ); Sun, 28 Jan 2018 17:29:19 -0500 Received: from mail-dm3nam03on0120.outbound.protection.outlook.com ([104.47.41.120]:15392 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932260AbeA1W3M (ORCPT ); Sun, 28 Jan 2018 17:29:12 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Branislav Radocaj , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 29/49] net: ethernet: arc: fix error handling in emac_rockchip_probe Thread-Topic: [PATCH AUTOSEL for 4.9 29/49] net: ethernet: arc: fix error handling in emac_rockchip_probe Thread-Index: AQHTmIc9eOgI66hTR0SpAOCRcMDngA== Date: Sun, 28 Jan 2018 22:27:54 +0000 Message-ID: <20180128222727.22404-29-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1097;7:PU7mOi5iD2vP4s/6x9XtRnvmGLgvBuUNrDZsEf4myPjuCbrvaG3Rn+5ECwIPR28v2UXvbez9iAH6mdBkJB8wu65Kz8Zw1HHO5WtnGSwB1vr4NlLgSVhft47yoQJZz2C6k3AFOpWlSxMXkjuHKxG8PO6GOlTyZu8kGHYsM2pZkgSm0JjQxNnQqLvmaZYuqMBzPojiMRNqGIqQCGZYGO6xF+VLeYehAXr51gvXK5z1YEDyQkt3eNKHRNTXfulvogze x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 35093b98-d322-458e-dd12-08d5669e884b x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(59450400001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(99286004)(110136005)(54906003)(107886003)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: JAFMJARlyzVNXBY55pewgieyta7K5k2oWT9nZ5aYkGSITyMmsnYC1FaSybouvOW7oSoMldYN+kASDvD75nPu9A== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35093b98-d322-458e-dd12-08d5669e884b X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:54.8135 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Branislav Radocaj [ Upstream commit e46772a6946a7d1f3fbbc1415871851d6651f1d4 ] If clk_set_rate() fails, we should disable clk before return. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Branislav Radocaj Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/arc/emac_rockchip.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/etherne= t/arc/emac_rockchip.c index e278e3d96ee0..c6163874e4e7 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -220,9 +220,11 @@ static int emac_rockchip_probe(struct platform_device = *pdev) =20 /* RMII TX/RX needs always a rate of 25MHz */ err =3D clk_set_rate(priv->macclk, 25000000); - if (err) + if (err) { dev_err(dev, "failed to change mac clock rate (%d)\n", err); + goto out_clk_disable_macclk; + } } =20 err =3D arc_emac_probe(ndev, interface); @@ -232,7 +234,8 @@ static int emac_rockchip_probe(struct platform_device *= pdev) } =20 return 0; - +out_clk_disable_macclk: + clk_disable_unprepare(priv->macclk); out_regulator_disable: if (priv->regulator) regulator_disable(priv->regulator); --=20 2.11.0