aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Ritz <daniel.ritz@gmx.ch>2005-07-28 01:07:28 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 08:39:01 -0700
commitd8c4b4195c7d664baf296818bf756775149232d3 (patch)
tree0ca8d557b9bdb44836255ec72d1c4273db50bcce
parenta1b274fbe3f00469fb8a68806469ec7746c7f648 (diff)
downloadlinux-yocto-4.8-d8c4b4195c7d664baf296818bf756775149232d3.tar.gz
linux-yocto-4.8-d8c4b4195c7d664baf296818bf756775149232d3.tar.bz2
linux-yocto-4.8-d8c4b4195c7d664baf296818bf756775149232d3.zip
[PATCH] yenta: free_irq() on suspend.
Resume doesn't seem to work without. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/pcmcia/yenta_socket.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 6837491f021c..744e469a9eda 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);
}