[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 0e7aa8176692..15f716a7968a 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1055,6 +1055,7 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state)
                 pci_save_state(dev);
                 pci_read_config_dword(dev, 16*4, &socket->saved_state[0]);
                 pci_read_config_dword(dev, 17*4, &socket->saved_state[1]);
+                pci_disable_device(dev);
 
                 /*
                  * Some laptops (IBM T22) do not like us putting the Cardbus
@@ -1078,6 +1079,8 @@ static int yenta_dev_resume (struct pci_dev *dev)
                 pci_restore_state(dev);
                 pci_write_config_dword(dev, 16*4, socket->saved_state[0]);
                 pci_write_config_dword(dev, 17*4, socket->saved_state[1]);
+                pci_enable_device(dev);
+                pci_set_master(dev);
 
                 if (socket->type && socket->type->restore_state)
                         socket->type->restore_state(socket);