Message ID | 20200602020817.236422-20-marcelo.cerri@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49bb7z6K2cz9sSJ; Tue, 2 Jun 2020 12:09:19 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1jfwMc-0005oj-U7; Tue, 02 Jun 2020 02:09:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <marcelo.cerri@canonical.com>) id 1jfwMP-0005ck-HM for kernel-team@lists.ubuntu.com; Tue, 02 Jun 2020 02:09:01 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <marcelo.cerri@canonical.com>) id 1jfwMO-00020l-GG for kernel-team@lists.ubuntu.com; Tue, 02 Jun 2020 02:09:00 +0000 Received: by mail-qk1-f197.google.com with SMTP id v197so6029197qkb.16 for <kernel-team@lists.ubuntu.com>; Mon, 01 Jun 2020 19:09:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kcLAe3wr3CHrmP1Ghh0tSVsaCFIUaCxKGmFBpTntorM=; b=bAViE0cOkM48wyrMNfUEpPCp56xyDTuBPdoVSLREjkMyFdMK7F4BhWAXgMp6QD/YoB grsABYE0TrR5W3ZZdVvfeIcepPWC5qSTkXhgt/dXGUuPXDGrsT3s5GTqgntMV/wbb8Mc 4HMHI1bmYNLfZS2wBXeBi9SLQ+GKh0pH0FA4ebOO9lWsLdnQTWaCoAfrR52PabxcCHad R/j4y5pYOa3Q3b1CHsNOMZ4R6SMiwYS/C9tNAAwa+gQBHqF52ATgbgMq3qqyBvZvb2hS vDIuVWQAAvG0JsFQEQwrzNWEynKwZU+V/kEJoZSL7w3gNOxX1e0VOTIFxoHgbN4wAktJ wWtg== X-Gm-Message-State: AOAM53172DW6W/D7DXzNpSHwKVwThmRwSp2wC8bRvJKkXrYStjDnZEN2 SAOHSQh/XcOwsiwRJZvDNsEQv1kVKl+I5GSuoH9t7BrTAGiQ/fbIYGtWDh1nuLlhEyHVAFehrrF URHg6mcMyNYx8WW4cWp73/BRMML3KQqSohXewarpy X-Received: by 2002:a0c:8c4a:: with SMTP id o10mr23863438qvb.123.1591063738832; Mon, 01 Jun 2020 19:08:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR/oh1N9ojAqA3Y2Dk89ncW/6FKBUpO/UZRfFSrRWpWXs/2UqGmhG5Npd8TAhHi3pKsvlbwA== X-Received: by 2002:a0c:8c4a:: with SMTP id o10mr23863425qvb.123.1591063738531; Mon, 01 Jun 2020 19:08:58 -0700 (PDT) Received: from gallifrey.lan ([201.82.186.200]) by smtp.gmail.com with ESMTPSA id t13sm1138342qtc.77.2020.06.01.19.08.56 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 19:08:57 -0700 (PDT) From: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [focal:linux-azure][PATCH 19/21] PM: hibernate: Propagate the return value of hibernation_restore() Date: Mon, 1 Jun 2020 23:08:15 -0300 Message-Id: <20200602020817.236422-20-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200602020817.236422-1-marcelo.cerri@canonical.com> References: <20200602020817.236422-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
LP:#1880032 - [linux-azure] Enable Hibernation on The 18.04 and 20.04 5.4 Kernels
|
expand
|
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b6c5895ced36..5944a4c13e28 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -678,7 +678,7 @@ static int load_image_and_restore(void) error = swsusp_read(&flags); swsusp_close(FMODE_READ); if (!error) - hibernation_restore(flags & SF_PLATFORM_MODE); + error = hibernation_restore(flags & SF_PLATFORM_MODE); pr_err("Failed to load hibernation image, recovering.\n"); swsusp_free();