Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c4b419 authored by Daniel Ritz's avatar Daniel Ritz Committed by Linus Torvalds
Browse files

[PATCH] yenta: free_irq() on suspend. 



Resume doesn't seem to work without.

Signed-off-by: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a1b274fb

drivers/pcmcia/yenta_socket.c

+9 −0
Original line number Diff line number Diff line
@@ -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);

	}