Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757972Ab0FBMXn (ORCPT ); Wed, 2 Jun 2010 08:23:43 -0400 Received: from crca.org.au ([74.207.252.120]:46382 "EHLO crca.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757896Ab0FBMUI (ORCPT ); Wed, 2 Jun 2010 08:20:08 -0400 X-Bogosity: Ham, spamicity=0.000000 From: Nigel Cunningham To: "Rafael J. Wysocki" , Linux PM , LKML , TuxOnIce-devel Subject: [PATCH 05/21] Hiberation: Fix speed display. Date: Wed, 2 Jun 2010 22:19:04 +1000 Message-Id: <1275481160-31150-6-git-send-email-nigel@tuxonice.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1275481160-31150-1-git-send-email-nigel@tuxonice.net> References: <1275481160-31150-1-git-send-email-nigel@tuxonice.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1017 Lines: 30 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 ff2fc15..1e6e5b6 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -485,7 +485,7 @@ static int save_image(struct swap_map_handle *handle, printk(KERN_CONT "\b\b\b\bdone\n"); else printk(KERN_CONT "\n"); - swsusp_show_speed(&start, &stop, nr_to_write, "Wrote"); + swsusp_show_speed(&start, &stop, nr_pages, "Wrote"); return ret; } -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/