From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517179553-2-18315195536756887224 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 unknown, 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=1517179553; b=tQrrrGDII+QzjrWlYn/rc2LBNUmr/DNk5fMACVxiTEHHMqo +8+caJotl+aQJ1H65zCRNYm1DCXZqFq9sriC2Su0J6Y+afsSKM9XUihpEmFR1zst gfE2aIbVd/47r3yaJWAkQC+nUACfWSIchtQKVyiYIFKMj+0WETvJJhQ+IISIFaFR H3awSmtl3Sfo+jpT+xGmNlwnrdqZzTG5n9tfKsE4z8Xu8mmNosB5rcRTA0yERtv7 KzOahLlxuhN8Bm8/78gO3voQ6PsJdrHW+ZNazCpPIkPIYse2Ml2I4kcKNBn9Mb5O cFoytrkzZZKZkfOD8515aOgnL+Isl8ieAW1MkOw== 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=1517179553; bh=QX/bQ8 HlMIlui5gzoH+gO2L0ld92MZ+RK3GdYUMEAso=; b=c+FCkt/nfE5cAsyByCEyDz 4c98oDfrfYM7iwFKb8Bpk9INHavutallWHy9pB9PK0C05nrZhIEaLbhwrFFVOwJI w3rMOKKMauvGENd9PxVXkkw2ztxRpkBFMnEFGFsPLpABakEGaVCNt0g8uT7KTBb0 E6uqLAka47Ui/4EmZjaLrZHSBsTtluuMyivksmb5QdlYR9WKWcmqdwgi2oCXcSli Aiw6gKa+NRPJ1X8PExKCV1Ja76oLUChz6nrumjp/fg6tp6yJBpkSglvpbyOYUFh0 0RplYOIAlEpFkwCe9nQDT/fN8zydWhdLF2MrX+jaMu+5ug9O07WAhL1IsqY2JUqw == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BjE2XhWR 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BjE2XhWR 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 S932339AbeA1W3W (ORCPT ); Sun, 28 Jan 2018 17:29:22 -0500 Received: from mail-sn1nam01on0139.outbound.protection.outlook.com ([104.47.32.139]:17739 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752058AbeA1W3M (ORCPT ); Sun, 28 Jan 2018 17:29:12 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Stefan Potyra , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 38/49] ASoC: rockchip: disable clock on error Thread-Topic: [PATCH AUTOSEL for 4.9 38/49] ASoC: rockchip: disable clock on error Thread-Index: AQHTmIdBjbe0I/nMZkafSr/fAlO+Sg== Date: Sun, 28 Jan 2018 22:28:00 +0000 Message-ID: <20180128222727.22404-38-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;MW2PR2101MB0924;7:4hsG9D+WyAbyI5xjB+MVtxGofw2j+iVTpBYXBhOwrxLoKkmLmVqU3BsmQPFIUxqf2INrFdKtLUW1Own44BliYcgrWHWEfRM1fzuSycCIG/3PRVric4lMnTAl7Cw6E/fMbQVSjBema/+wGu5XphmYDtj/LTkOXrp2P1DAtCh4UlqCkk0dMUBxLxPQKW6ka3Un5rKOXgQl6UuAL+kJsroKi4WZXc8jiNjeUaaUfs/GjrgzLUyrVEsrdmSPQ6yp5aWG x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 1ef3ab9c-876c-4a62-8995-08d5669e8a94 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB0924; x-ms-traffictypediagnostic: MW2PR2101MB0924: 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)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB0924;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0924; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(39860400002)(366004)(39380400002)(376002)(189003)(199004)(2906002)(26005)(10090500001)(6116002)(3846002)(59450400001)(8936002)(6666003)(86362001)(36756003)(186003)(66066001)(99286004)(1076002)(107886003)(86612001)(4326008)(25786009)(5250100002)(68736007)(2900100001)(2501003)(72206003)(6512007)(3280700002)(22452003)(53936002)(478600001)(10290500003)(106356001)(3660700001)(110136005)(54906003)(97736004)(6436002)(316002)(2950100002)(8676002)(81156014)(76176011)(81166006)(6506007)(105586002)(305945005)(14454004)(6486002)(102836004)(5660300001)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0924;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 2I6xVPcVZP36kTCFF8bbCw8pUMZh/pP27JCI53n4DlGDky1HhuCuiaBuRlnUd9taupz+7GgkyLkoaA2jLQX8VA== 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: 1ef3ab9c-876c-4a62-8995-08d5669e8a94 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:00.4615 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0924 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: Stefan Potyra [ Upstream commit c7b92172a61b91936be985cb9bc499a4ebc6489b ] Disable the clocks in rk_spdif_probe when an error occurs after one of the clocks has been enabled previously. Found by Linux Driver Verification project (linuxtesting.org). Fixes: f874b80e1571 ASoC: rockchip: Add rockchip SPDIF transceiver driver Signed-off-by: Stefan Potyra Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/rockchip/rockchip_spdif.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockc= hip_spdif.c index fa8101d1e16f..f387d7bae3d4 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -318,26 +318,30 @@ static int rk_spdif_probe(struct platform_device *pde= v) spdif->mclk =3D devm_clk_get(&pdev->dev, "mclk"); if (IS_ERR(spdif->mclk)) { dev_err(&pdev->dev, "Can't retrieve rk_spdif master clock\n"); - return PTR_ERR(spdif->mclk); + ret =3D PTR_ERR(spdif->mclk); + goto err_disable_hclk; } =20 ret =3D clk_prepare_enable(spdif->mclk); if (ret) { dev_err(spdif->dev, "clock enable failed %d\n", ret); - return ret; + goto err_disable_clocks; } =20 res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); regs =3D devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(regs)) - return PTR_ERR(regs); + if (IS_ERR(regs)) { + ret =3D PTR_ERR(regs); + goto err_disable_clocks; + } =20 spdif->regmap =3D devm_regmap_init_mmio_clk(&pdev->dev, "hclk", regs, &rk_spdif_regmap_config); if (IS_ERR(spdif->regmap)) { dev_err(&pdev->dev, "Failed to initialise managed register map\n"); - return PTR_ERR(spdif->regmap); + ret =3D PTR_ERR(spdif->regmap); + goto err_disable_clocks; } =20 spdif->playback_dma_data.addr =3D res->start + SPDIF_SMPDR; @@ -369,6 +373,10 @@ static int rk_spdif_probe(struct platform_device *pdev= ) =20 err_pm_runtime: pm_runtime_disable(&pdev->dev); +err_disable_clocks: + clk_disable_unprepare(spdif->mclk); +err_disable_hclk: + clk_disable_unprepare(spdif->hclk); =20 return ret; } --=20 2.11.0