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

Configure Feed

Select the types of activity you want to include in your feed.

[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>

authored by

Daniel Ritz and committed by
Linus Torvalds d8c4b419 a1b274fb

+9
+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 + 1110 1112 /* 1111 1113 * Some laptops (IBM T22) do not like us putting the Cardbus 1112 1114 * bridge into D3. At a guess, some other laptop will ··· 1133 1131 pci_write_config_dword(dev, 17*4, socket->saved_state[1]); 1134 1132 pci_enable_device(dev); 1135 1133 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 + } 1136 1141 1137 1142 if (socket->type && socket->type->restore_state) 1138 1143 socket->type->restore_state(socket);