From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933246AbcBAOwu (ORCPT ); Mon, 1 Feb 2016 09:52:50 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:33604 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933169AbcBAOwV (ORCPT ); Mon, 1 Feb 2016 09:52:21 -0500 From: Roman Pen Cc: Roman Pen , Gi-Oh Kim , "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] hibernate: fix disk and module leak on successfull resume Date: Mon, 1 Feb 2016 15:51:55 +0100 Message-Id: <1454338315-13465-5-git-send-email-roman.penyaev@profitbricks.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1454338315-13465-1-git-send-email-roman.penyaev@profitbricks.com> References: <1454338315-13465-1-git-send-email-roman.penyaev@profitbricks.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not forget to put the disk back. Signed-off-by: Roman Pen Cc: Gi-Oh Kim Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Pavel Machek Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- kernel/power/hibernate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b7342a2..1f53dc2 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -785,8 +785,11 @@ static int software_resume(void) */ if (isdigit(resume_file[0]) && resume_wait) { int partno; - while (!get_gendisk(swsusp_resume_device, &partno)) + struct gendisk *disk; + + while (!(disk = get_gendisk(swsusp_resume_device, &partno))) msleep(10); + put_gendisk(disk); } if (!swsusp_resume_device) { -- 2.6.2