From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932187Ab0IYERV (ORCPT ); Sat, 25 Sep 2010 00:17:21 -0400 Received: from crca.org.au ([74.207.252.120]:54715 "EHLO crca.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932150Ab0IYERT (ORCPT ); Sat, 25 Sep 2010 00:17:19 -0400 X-Bogosity: Ham, spamicity=0.000000 From: Nigel Cunningham To: "Rafael J. Wysocki" , Linux PM , LKML , TuxOnIce-devel Subject: [PATCH 06/22] Hiberation: Fix speed display. Date: Sat, 25 Sep 2010 14:16:48 +1000 Message-Id: <1285388224-10012-7-git-send-email-nigel@tuxonice.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1285388224-10012-1-git-send-email-nigel@tuxonice.net> References: <1285388224-10012-1-git-send-email-nigel@tuxonice.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Correct the situation where, if an error occurs while writing an image, the speed display still uses the number of pages that should have been written, rather than the number of pages that were written. Signed-off-by: Nigel Cunningham --- kernel/power/swap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index bebd2cf..2ef2bad 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -489,7 +489,7 @@ static int save_image(struct swap_map_handle *handle, printk(KERN_CONT "\b\b\b\bdone\n"); else printk(KERN_CONT "\n"); - mps = swsusp_show_speed(&start, &stop, nr_to_write, "Wrote"); + mps = swsusp_show_speed(&start, &stop, nr_pages, "Wrote"); write_speed = (mps < 256) ? (char) mps : 0; return ret; } -- 1.7.0.4