From f48909d9aa8d39af8bc69ec606fb21c6141476f0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 30 Jul 2005 13:41:56 -0700 Subject: [PATCH] --- yaml --- r: 5525 b: refs/heads/master c: 889371f61fd5bb914d0331268f12432590cf7e85 h: refs/heads/master i: 5523: 00a3334f7e1360451c71ffcdd4c3ba8d19d074c1 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/yenta_socket.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0dadaf7ef663..660b03360274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 035a4a4f8976bdf12aab992c630d3a6cfba90ea8 +refs/heads/master: 889371f61fd5bb914d0331268f12432590cf7e85 diff --git a/trunk/drivers/pcmcia/yenta_socket.c b/trunk/drivers/pcmcia/yenta_socket.c index 744e469a9eda..6837491f021c 100644 --- a/trunk/drivers/pcmcia/yenta_socket.c +++ b/trunk/drivers/pcmcia/yenta_socket.c @@ -1107,8 +1107,6 @@ 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 @@ -1134,13 +1132,6 @@ 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); }