From patchwork Tue Jan 30 16:19:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10192033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28A3560375 for ; Tue, 30 Jan 2018 16:19:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F991FEB1 for ; Tue, 30 Jan 2018 16:19:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C9B61FFF9; Tue, 30 Jan 2018 16:19:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C5CA1FEB1 for ; Tue, 30 Jan 2018 16:19:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651AbeA3QTc (ORCPT ); Tue, 30 Jan 2018 11:19:32 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:56724 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbeA3QTb (ORCPT ); Tue, 30 Jan 2018 11:19:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=cqvYIWZes9IT5xsuKBj/MobfZJV1j7byT/2rtKA0Ito=; b=C0FrL4um6ai4 8G06ZHMbhrNsbDHJxXaIdObZOZkJfVKeno+clo8I4Igp9xUkK5qI/9N3v5O0dtu2bDjWcbFEoNcdB vEIJzXjc/dIJ1TBAVQvAlP0Qyxk5vTmeGf+PZCl3xQWG7Ds9YaqBoUYu8m0ds/tYyNJ6YCkUno8Th KKc0M=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1egYd6-0004yn-ED; Tue, 30 Jan 2018 16:19:28 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1egYd5-0000f8-9h; Tue, 30 Jan 2018 16:19:27 +0000 From: Mark Brown To: Mark Brown Cc: Geert Uytterhoeven , Geert Uytterhoeven , Geert Uytterhoeven , Liam Girdwood , Chunyan Zhang , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Applied "regulator: Fix suspend to idle" to the regulator tree In-Reply-To: <20180130120340.GB10525@sirena.org.uk> Message-Id: Date: Tue, 30 Jan 2018 16:19:27 +0000 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch regulator: Fix suspend to idle has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 57a0dd187956ea04870f4bbbf25a63c425ee7cad Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 30 Jan 2018 12:16:31 +0000 Subject: [PATCH] regulator: Fix suspend to idle When suspending to idle with the new suspend mode configuration support we go through the suspend callbacks with a state of PM_SUSPEND_TO_IDLE which we don't have regulator constraints for, causing an error. Avoid this and similar errors by treating missing constraints as a noop. Reported-by: Geert Uytterhoeven Tested-by: Geert Uytterhoeven Signed-off-by: Mark Brown --- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 42681c10cbe4..dd4708c58480 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -758,7 +758,7 @@ static int suspend_set_state(struct regulator_dev *rdev, rstate = regulator_get_suspend_state(rdev, state); if (rstate == NULL) - return -EINVAL; + return 0; /* If we have no suspend mode configration don't set anything; * only warn if the driver implements set_suspend_voltage or