From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Date: Fri, 17 Feb 2012 22:39:51 +0000 (+0100)
Subject: PM / Hibernate: Enable usermodehelpers in hibernate() error path
X-Git-Tag: v3.2.14~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b952bf66061416f9da18ce8ff54d01808220480;p=pandora-kernel.git

PM / Hibernate: Enable usermodehelpers in hibernate() error path

commit 05b4877f6a4f1ba4952d1222213d262bf8c132b7 upstream.

If create_basic_memory_bitmaps() fails, usermodehelpers are not re-enabled
before returning. Fix this. And while at it, reword the goto labels so that
they look more meaningful.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed