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

Commit 85c93fa9 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: cyclades, clear interrupts before releasing 



Without this patch, the driver sometimes causes "IRQXX: Nobody cares".  Fix it
by turning off irqs when releasing.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6ad1ccc1

drivers/char/cyclades.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -5341,6 +5341,17 @@ static void __devexit cy_pci_release(struct pci_dev *pdev) 
	struct cyclades_card *cinfo = pci_get_drvdata(pdev);

	struct cyclades_card *cinfo = pci_get_drvdata(pdev);

	unsigned int i;

	unsigned int i;





	/* non-Z with old PLX */

	if (cinfo->num_chips != -1 && (readb(cinfo->base_addr + CyPLX_VER) &

				0x0f) == PLX_9050)

		cy_writeb(cinfo->ctl_addr + 0x4c, 0);

	else

#ifndef CONFIG_CYZ_INTR

		if (cinfo->num_chips != -1)

#endif

		cy_writew(cinfo->ctl_addr + 0x68,

				readw(cinfo->ctl_addr + 0x68) & ~0x0900);



	pci_iounmap(pdev, cinfo->base_addr);

	pci_iounmap(pdev, cinfo->base_addr);

	if (cinfo->ctl_addr)

	if (cinfo->ctl_addr)

		pci_iounmap(pdev, cinfo->ctl_addr);

		pci_iounmap(pdev, cinfo->ctl_addr);
@@ -5560,6 +5571,8 @@ static void __exit cy_cleanup_module(void) 
				cy_pci_release(cy_card[i].pdev);

				cy_pci_release(cy_card[i].pdev);

				continue;

				continue;

			}

			}

			/* clear interrupt */

			cy_writeb(cy_card[i].base_addr + Cy_ClrIntr, 0);

			iounmap(cy_card[i].base_addr);

			iounmap(cy_card[i].base_addr);

			if (cy_card[i].ctl_addr)

			if (cy_card[i].ctl_addr)

				iounmap(cy_card[i].ctl_addr);

				iounmap(cy_card[i].ctl_addr);