From patchwork Thu Mar 1 15:26:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130256 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2948513edc; Thu, 1 Mar 2018 07:35:20 -0800 (PST) X-Google-Smtp-Source: AG47ELsIroPr409YxFBDfEaN6gNgR9nOuhUeWVjEyRqTSkdLd71DBk8fsg5FLpVm6FkDXAzt8+Qi X-Received: by 10.98.86.151 with SMTP id h23mr2323550pfj.79.1519918520693; Thu, 01 Mar 2018 07:35:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918520; cv=none; d=google.com; s=arc-20160816; b=J4jH8t2k3phei1SoZSKIxhroMGBuLiVPpt3ln8mq12tnRpff6vHjyf0zYQVq9iSmxg Jiog9oAvU19KzxT+oitIUBYvTOiN79ByPbz0YkiQqNTepVm7y/q0u85raX+kKCmD5Vvt X53dcJaO9rin6ycT+hXtP6E9i32H/g62c2wda3o4+HPh7w+FYlnD6mIXAsg94XjpgQep JweuTVcanB/7JKWM4w0AkcG8QSoGJ2MHBjVX4JFL5jDTrqPeZBJuaZEi/OOD/PqV77LK eVm7MiKawM1RGcHJ+ahbshUP1TcL/GLI0M3NvEEzbjGVj0HtTRrLNqYA41KFIKNd5z7s 53mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=Tbm27QscheDboTV867rx245IWueOFCpk324gXd3sSCE=; b=Ycoz2ftO5c8coKNBZRVteATPT+I57okqm4bI1C+vQubai1XtX3o8/Muxo4VhaixUuD Z6Aod90iwp7zplm8QRk8PJpvm4qa3x+owcysHFtx2xR/evbAE9RIe1OqSzhFHRNLU0oB EqNma8sheGdewXb+a64JkmlxqOKAbuCknqQn0KkhFYBGOonGVXpQnf1P65l78IabXDyV qekQer5cRV2SU3CJGJTdJ1oHE1+Y0rWJSz82MCKXmK4swmGgUiLMKDk+J3nFmdvCNjJO abuTElYcrXhVPrJvhYKgQ4ll0AyueOilMb5XYYws9qelXHl4IAw1K7zce7Ig3h7mDG8k FtKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=e60qEs5v; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z12si1458773pgo.463.2018.03.01.07.35.20; Thu, 01 Mar 2018 07:35:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=e60qEs5v; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032317AbeCAPfS (ORCPT + 10 others); Thu, 1 Mar 2018 10:35:18 -0500 Received: from mail-by2nam03on0090.outbound.protection.outlook.com ([104.47.42.90]:61856 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032422AbeCAPfJ (ORCPT ); Thu, 1 Mar 2018 10:35:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Tbm27QscheDboTV867rx245IWueOFCpk324gXd3sSCE=; b=e60qEs5vgFs3OOkp3iBk45i7pBITnTkaQ8xBK9UVlQ6ydJmcF5gTFo/T0+E/VeRHEPe7KLZ1w8fV4wA+a/AXi4JjgYvHWXxT3aXB8JtFRoIvya/ziCVrQpDh+mZmEvObMrvVSqc+PRjpVJMF64Xm2v95+tuBtNMmlrfPtukUUyY= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1047.namprd21.prod.outlook.com (52.132.128.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:35:03 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:35:03 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Bjorn Andersson , MyungJoo Ham , Sasha Levin Subject: [added to the 4.1 stable tree] PM / devfreq: Propagate error from devfreq_add_device() Thread-Topic: [added to the 4.1 stable tree] PM / devfreq: Propagate error from devfreq_add_device() Thread-Index: AQHTsXGnvEWpcps+GECxNAAlFJr2fg== Date: Thu, 1 Mar 2018 15:26:22 +0000 Message-ID: <20180301152116.1486-359-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-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; DM5PR2101MB1047; 7:s9tKdOXFIm7lAyV9F4bsll89YtnNKuKnwwT8ysx9NZYB06EJybpKYgmbR/2rEenp+g4L06d/znuNR2qnxZ2/hAE02Jo6Caivy4It6PRstix/7gyO6TFURSYkwxwite06ICRJSd8bpmkG8TPXI3bNaO2JXMEv84YUBT+T6Zsk+Yz4WWtakZWO4qlGugIJxWywtPquobhJHbPHRTrkvRjJ9YvxNxPffFwUOTk9DciJ8TpAnB3QohVqsEnROINP0owS x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 20ea61b8-01a8-472e-327d-08d57f8a00d5 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1047; x-ms-traffictypediagnostic: DM5PR2101MB1047: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(7411616537696); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501227)(52105095)(93006095)(93001095)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1047; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1047; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(366004)(396003)(376002)(346002)(189003)(199004)(22452003)(2900100001)(106356001)(3846002)(6506007)(59450400001)(6346003)(6666003)(6116002)(97736004)(8676002)(66066001)(68736007)(186003)(2950100002)(26005)(107886003)(25786009)(76176011)(81156014)(81166006)(102836004)(10090500001)(8936002)(2906002)(1076002)(6486002)(4326008)(54906003)(110136005)(305945005)(7736002)(105586002)(36756003)(5660300001)(3660700001)(6512007)(99286004)(6436002)(86612001)(10290500003)(478600001)(5250100002)(2501003)(3280700002)(14454004)(53936002)(72206003)(316002)(86362001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1047; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: oUN+zFWpMblBgEZN92ClCuz5778SWqjnoru/c9WsEVf6/Z4zWdQ6RgB2xQPo1JlXsgeoL9TukMJLi5ZVne1eulj0SkUG8g5j9C6+b2jVGej8sQjZIOFQCBxN6Tr6mKtQ+Q0zqrpMb7YSA+QJ1n2Kk2HjHPEldXit2xyT31x87jo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20ea61b8-01a8-472e-327d-08d57f8a00d5 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:26:22.7326 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1047 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit d1bf2d30728f310f72296b54f0651ecdb09cbb12 ] Propagate the error of devfreq_add_device() in devm_devfreq_add_device() rather than statically returning ENOMEM. This makes it slightly faster to pinpoint the cause of a returned error. Fixes: 8cd84092d35e ("PM / devfreq: Add resource-managed function for devfreq device") Cc: stable@vger.kernel.org Acked-by: Chanwoo Choi Signed-off-by: Bjorn Andersson Signed-off-by: MyungJoo Ham Signed-off-by: Sasha Levin --- drivers/devfreq/devfreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index ca1b362d77e2..3373561caae8 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -584,7 +584,7 @@ struct devfreq *devm_devfreq_add_device(struct device *dev, devfreq = devfreq_add_device(dev, profile, governor_name, data); if (IS_ERR(devfreq)) { devres_free(ptr); - return ERR_PTR(-ENOMEM); + return devfreq; } *ptr = devfreq;