diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-29 23:31:17 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-29 23:31:17 -0400 |
| commit | d6ac1a7910d22626bc77e73db091e00b810715f4 (patch) | |
| tree | c8f235b7287056a03bc2bc032902469a331b5e56 /drivers/pcmcia/yenta_socket.c | |
| parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) | |
| parent | 87bec66b9691522414862dd8d41e430b063735ef (diff) | |
/home/lenb/src/to-linus branch 'acpi-2.6.12'
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
| -rw-r--r-- | drivers/pcmcia/yenta_socket.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 6837491f021..744e469a9ed 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -1107,6 +1107,8 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) pci_read_config_dword(dev, 17*4, &socket->saved_state[1]); pci_disable_device(dev); + free_irq(dev->irq, socket); + /* * Some laptops (IBM T22) do not like us putting the Cardbus * bridge into D3. At a guess, some other laptop will @@ -1132,6 +1134,13 @@ static int yenta_dev_resume (struct pci_dev *dev) pci_enable_device(dev); pci_set_master(dev); + if (socket->cb_irq) + if (request_irq(socket->cb_irq, yenta_interrupt, + SA_SHIRQ, "yenta", socket)) { + printk(KERN_WARNING "Yenta: request_irq() failed on resume!\n"); + socket->cb_irq = 0; + } + if (socket->type && socket->type->restore_state) socket->type->restore_state(socket); } |