diff options
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 f9d2367b6bdf..6837491f021c 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -1105,6 +1105,7 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) | |||
1105 | pci_save_state(dev); | 1105 | pci_save_state(dev); |
1106 | pci_read_config_dword(dev, 16*4, &socket->saved_state[0]); | 1106 | pci_read_config_dword(dev, 16*4, &socket->saved_state[0]); |
1107 | pci_read_config_dword(dev, 17*4, &socket->saved_state[1]); | 1107 | pci_read_config_dword(dev, 17*4, &socket->saved_state[1]); |
1108 | pci_disable_device(dev); | ||
1108 | 1109 | ||
1109 | /* | 1110 | /* |
1110 | * Some laptops (IBM T22) do not like us putting the Cardbus | 1111 | * Some laptops (IBM T22) do not like us putting the Cardbus |
@@ -1128,6 +1129,8 @@ static int yenta_dev_resume (struct pci_dev *dev) | |||
1128 | pci_restore_state(dev); | 1129 | pci_restore_state(dev); |
1129 | pci_write_config_dword(dev, 16*4, socket->saved_state[0]); | 1130 | pci_write_config_dword(dev, 16*4, socket->saved_state[0]); |
1130 | pci_write_config_dword(dev, 17*4, socket->saved_state[1]); | 1131 | pci_write_config_dword(dev, 17*4, socket->saved_state[1]); |
1132 | pci_enable_device(dev); | ||
1133 | pci_set_master(dev); | ||
1131 | 1134 | ||
1132 | if (socket->type && socket->type->restore_state) | 1135 | if (socket->type && socket->type->restore_state) |
1133 | socket->type->restore_state(socket); | 1136 | socket->type->restore_state(socket); |