summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 16:04:50 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 16:04:50 -0700
commit3f603ed319d5120e883e64ac5967b2fc848fc43b (patch)
tree52ef311c245e4e4cd623b546ea1daf05a5ea8911 /drivers/pcmcia
parent55ee3b8365fd5d301b9076eea739146f2b91e82c (diff)
parent5028770a42e7bc4d15791a44c28f0ad539323807 (diff)
downloadop-kernel-dev-3f603ed319d5120e883e64ac5967b2fc848fc43b.zip
op-kernel-dev-3f603ed319d5120e883e64ac5967b2fc848fc43b.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/yenta_socket.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index f9d2367..6837491 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)
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
@@ -1128,6 +1129,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);
OpenPOWER on IntegriCloud