PM / yenta: Split resume into early and late parts (rev. 4)
commitee2c54041db5404353aa768ba1ec6e4fbda7ef5f
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 3 Nov 2009 09:54:58 +0000 (3 10:54 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 Nov 2009 00:23:17 +0000 (9 16:23 -0800)
tree7f9a26f32527885aa3f55fd0a4046839ca38886e
parent54fb902e50fee7b3c39d31853805f849edfdd62e
PM / yenta: Split resume into early and late parts (rev. 4)

commit 9905d1b411946fb3fb228e8c6529fd94afda8a92 upstream.

Commit 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c
(PM / yenta: Fix cardbus suspend/resume regression) caused resume to
fail on systems with two CardBus bridges.  While the exact nature
of the failure is not known at the moment, it can be worked around by
splitting the yenta resume into an early part, executed during the
early phase of resume, that will only resume the socket and power it
up if there was a card in it during suspend, and a late part,
executed during "regular" resume, that will carry out all of the
remaining yenta resume operations.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14334, which is a
listed regression from 2.6.31.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Reported-by: Stephen J. Gowdy <gowdy@cern.ch>
Tested-by: Jose Marino <braket@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pcmcia/cs.c
drivers/pcmcia/yenta_socket.c
include/pcmcia/ss.h