From patchwork Sat Nov 8 16:17:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5257181 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 862B2C11AC for ; Sat, 8 Nov 2014 16:17:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1433120145 for ; Sat, 8 Nov 2014 16:17:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 393092012B for ; Sat, 8 Nov 2014 16:17:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbaKHQRa (ORCPT ); Sat, 8 Nov 2014 11:17:30 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:58753 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753725AbaKHQR3 (ORCPT ); Sat, 8 Nov 2014 11:17:29 -0500 Received: by mail-wi0-f170.google.com with SMTP id r20so6761232wiv.3 for ; Sat, 08 Nov 2014 08:17:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=M3dkUO/P9bndPymrgWwt5q0txnBHuTtQy0jBWDSQ/7U=; b=yexXfpYdwddVjycQD7KcG1QU4JTdM/u4LqeEXzDlXafSPPGHlqcnZ5tCChKuCEwQ0Q wv4YaULT0ZIpSXqOZDLZP2ctuQu16NI+gmdpTwWbpY2O9udoYnU5tACsF0xb/eXzuz5U Bn7vBM1Q2j0dYQMYrdS0CoOLUXllInZlbHj/AcUa7v9f7aDi000+5kb6Ch+Rsv3V7dpm VVWWlXVMnUh4tE0aQmt6bkxSgzdqqz12760JGT9mWgNMwqEN/okXStb52u/+2MaEYEPg w67qhiquTf0fSM7LBEscy9ER11L2S7+ld0osI34/gnOBlc/nBgK6LZk9G0zTRvyGyPmD 5Bgw== X-Received: by 10.180.19.164 with SMTP id g4mr15152659wie.51.1415463448398; Sat, 08 Nov 2014 08:17:28 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id kn5sm8398478wjb.48.2014.11.08.08.17.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Nov 2014 08:17:27 -0800 (PST) From: Dmitry Eremin-Solenikov To: linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH] Fix entering suspend-to-IDLE if no freeze_oops is set Date: Sat, 8 Nov 2014 19:17:13 +0300 Message-Id: <1415463433-5267-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If no freeze_ops is set, trying to enter suspend-to-IDLE will cause a nice oops in platform_suspend_prepare_late(). Add respective checks to platform_suspend_prepare_late() and platform_resume_early() functions. Fixes: a8d46b9e (ACPI / sleep: Rework the handling of ACPI GPE wakeup ...) Signed-off-by: Dmitry Eremin-Solenikov --- kernel/power/suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 4ca9a33..c347e3c 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -146,7 +146,7 @@ static int platform_suspend_prepare(suspend_state_t state) static int platform_suspend_prepare_late(suspend_state_t state) { - return state == PM_SUSPEND_FREEZE && freeze_ops->prepare ? + return state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->prepare ? freeze_ops->prepare() : 0; } @@ -164,7 +164,7 @@ static void platform_resume_noirq(suspend_state_t state) static void platform_resume_early(suspend_state_t state) { - if (state == PM_SUSPEND_FREEZE && freeze_ops->restore) + if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->restore) freeze_ops->restore(); }