tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "yenta free_irq on suspend"

ACPI is wrong. Devices should not release their IRQ's on suspend and
re-aquire them on resume. ACPI should just re-init the IRQ controller
instead of breaking most drivers very subtly.

Breakage reported by Hugh Dickins <hugh@veritas.com>

Undo: d8c4b4195c7d664baf296818bf756775149232d3

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Linus Torvalds 889371f6 035a4a4f

-9
unified split
-9
drivers/pcmcia/yenta_socket.c
··· 1107 1107 pci_read_config_dword(dev, 17*4, &socket->saved_state[1]); 1108 1108 pci_disable_device(dev); 1109 1109 1110 - free_irq(dev->irq, socket); 1111 - 1112 1110 /* 1113 1111 * Some laptops (IBM T22) do not like us putting the Cardbus 1114 1112 * bridge into D3. At a guess, some other laptop will ··· 1131 1133 pci_write_config_dword(dev, 17*4, socket->saved_state[1]); 1132 1134 pci_enable_device(dev); 1133 1135 pci_set_master(dev); 1134 - 1135 - if (socket->cb_irq) 1136 - if (request_irq(socket->cb_irq, yenta_interrupt, 1137 - SA_SHIRQ, "yenta", socket)) { 1138 - printk(KERN_WARNING "Yenta: request_irq() failed on resume!\n"); 1139 - socket->cb_irq = 0; 1140 - } 1141 1136 1142 1137 if (socket->type && socket->type->restore_state) 1143 1138 socket->type->restore_state(socket);