patch-2.4.15 linux/drivers/pcmcia/yenta.c

• Lines: 28
• Date: Tue Nov 20 23:19:48 2001
• Orig file: v2.4.14/linux/drivers/pcmcia/yenta.c
• Orig date: Tue Oct 9 17:06:52 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/pcmcia/yenta.c linux/drivers/pcmcia/yenta.c
@@ -673,6 +673,9 @@
 {
 	yenta_config_init(socket);
 	yenta_clear_maps(socket);
+
+	/* Re-enable interrupts */
+	cb_writel(socket, CB_SOCKET_MASK, CB_CDMASK);
 	return 0;
 }
 
@@ -680,6 +683,9 @@
 {
 	yenta_set_socket(socket, &dead_socket);
 
+	/* Disable interrupts */
+	cb_writel(socket, CB_SOCKET_MASK, 0x0);
+
 	/*
 	 * This does not work currently. The controller
 	 * loses too much informationduring D3 to come up
@@ -764,6 +770,7 @@
 {
 	/* Disable all events so we don't die in an IRQ storm */
 	cb_writel(sock, CB_SOCKET_MASK, 0x0);
+	exca_writeb(sock, I365_CSCINT, 0);
 
 	if (sock->cb_irq)
 		free_irq(sock->cb_irq, sock);