diff options
author | David Shaohua Li <shaohua.li@intel.com> | 2005-03-18 16:43:54 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-11 23:23:46 -0400 |
commit | d58da590451cf6ae75379a2ebf96d3afb8d810d8 (patch) | |
tree | 3b39228dbd1ed798965cf64f5bd98a498f5811cc /drivers/pcmcia | |
parent | 362b06bb70b5a5779b2e852e0f2bdb437061106e (diff) |
[ACPI] S3 Suspend to RAM: fix driver suspend/resume methods
Drivers should do this:
.suspend()
pci_disable_device()
.resume()
pci_enable_device()
http://bugzilla.kernel.org/show_bug.cgi?id=3469
Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/yenta_socket.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 6404d97a12e..caf7159a54b 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -1032,6 +1032,7 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) | |||
1032 | pci_save_state(dev); | 1032 | pci_save_state(dev); |
1033 | pci_read_config_dword(dev, 16*4, &socket->saved_state[0]); | 1033 | pci_read_config_dword(dev, 16*4, &socket->saved_state[0]); |
1034 | pci_read_config_dword(dev, 17*4, &socket->saved_state[1]); | 1034 | pci_read_config_dword(dev, 17*4, &socket->saved_state[1]); |
1035 | pci_disable_device(dev); | ||
1035 | 1036 | ||
1036 | /* | 1037 | /* |
1037 | * Some laptops (IBM T22) do not like us putting the Cardbus | 1038 | * Some laptops (IBM T22) do not like us putting the Cardbus |
@@ -1055,6 +1056,8 @@ static int yenta_dev_resume (struct pci_dev *dev) | |||
1055 | pci_restore_state(dev); | 1056 | pci_restore_state(dev); |
1056 | pci_write_config_dword(dev, 16*4, socket->saved_state[0]); | 1057 | pci_write_config_dword(dev, 16*4, socket->saved_state[0]); |
1057 | pci_write_config_dword(dev, 17*4, socket->saved_state[1]); | 1058 | pci_write_config_dword(dev, 17*4, socket->saved_state[1]); |
1059 | pci_enable_device(dev); | ||
1060 | pci_set_master(dev); | ||
1058 | 1061 | ||
1059 | if (socket->type && socket->type->restore_state) | 1062 | if (socket->type && socket->type->restore_state) |
1060 | socket->type->restore_state(socket); | 1063 | socket->type->restore_state(socket); |