From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517179225-2-11488669293495484811 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=1517179224; b=bTDWtZM1mKuAPINlVOm1a1W5ooWBy0K+NDEAN16RH8EokVS tcX96uSH5BkhW8EMcs5zEaLIfi6ioo5Vsze05/JPJ6t5QgV6quMpJEAb6McNln4u iPjgQvCslaks0DgswOaACDh9rsjZHLAx5Z6D5S/qKhNTSfJiyI3KFqB+55E+yC3w 4NZAHymAWKy9c32zGMR8ErQqE5sBUzY40mH93BiK5jRHYmk8268UpXd1aVDF3STd G0iUVtykRytBRCmCPUM7lSZrXLZ7LivY7+29RFXxluhHfvcG++cSwUyI9a9M1jE/ D7ZPksS9uaelsa5w+ZwdlZVF856X/AeMTcZQuuA== 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=1517179224; bh=oW1qnI 9wDcMVX5JLpyycAGwCkYbxTLaTlUjVt42kny4=; b=ox9PblWtMGi43FlTIIOQ9h YPJs4PlqF3dr55LtNHfZqQesDSZY7hnRbzJGaK3SXGKGmIaYUHYWYp9Vfm22OwCG gwu1frxfe/IP3Ih6RyTLbgAy5zgfIGM6jFRKd1znAmfU59uwyD8JAxar1dXk904G JXIY8kiwKcqyciySbXqdKvG9KgVTF9pnpHFwBZP5GSYdsVEVseETi5SvzVKsd4fq kaibve6XoRnKA93L/g7wDAVRcoZS5XebKhSO9webJUcB3USqEbdZzHyrZFQUz61K TJLLKXcFe3xIPYacRlWBtmkP1+7vbZTDU3SrBe5PkWhYwwkAeL1QNYMLKbktMGAw == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Rco+H8aW 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: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Rco+H8aW 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 S932814AbeA1WkI (ORCPT ); Sun, 28 Jan 2018 17:40:08 -0500 Received: from mail-cys01nam02on0124.outbound.protection.outlook.com ([104.47.37.124]:11968 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932467AbeA1W36 (ORCPT ); Sun, 28 Jan 2018 17:29:58 -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.4 28/36] ASoC: rockchip: disable clock on error Thread-Topic: [PATCH AUTOSEL for 4.4 28/36] ASoC: rockchip: disable clock on error Thread-Index: AQHTmIdaLNxO6O0ujUebq3O2wTAnhA== Date: Sun, 28 Jan 2018 22:28:43 +0000 Message-ID: <20180128222815.29479-28-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-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;MW2PR2101MB1114;7:sinlwSWuT5PXKQ29GJ7Rgo5AReFnDbUb8Xzo2nCBdjx9e6VnApFR9adK7oAHOaQCIHTQPNYDk0g6NFAgWGPHXYrCbXVnL0X9EZsavDQnL4xeV8NdlJFOd6cwKMSVsW0EC7uDp0ZpiS46nQ3psNHdvJFarTN+56IJ7jcgozb4yU9kAKUbWI1wwlHLubqp4rO+5GJwH2t2E9+K7Wf7WfHCSJGwdKh2bvi5ziyA42Hcq29FCHEBV43mbqdX9x0M6jO9 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 6612db9f-08af-4f28-df2e-08d5669ea703 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: 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)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(59450400001)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: ie7qsr0CgAPtMQ4iruIFQWNX5SmFiPEeQoAqrWmwF/xUx3jgs0vfEej3XWtj8qeYajILQyQKcbsxGFFNAFkvcQ== 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: 6612db9f-08af-4f28-df2e-08d5669ea703 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:43.6571 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 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 5a806da89f42..dae80be6ca71 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -316,26 +316,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; @@ -367,6 +371,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