Skip to content

Commit

Permalink
Char: cyclades, clear interrupts before releasing
Browse files Browse the repository at this point in the history
Without this patch, the driver sometimes causes "IRQXX: Nobody cares".  Fix it
by turning off irqs when releasing.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed May 8, 2007
1 parent 6ad1ccc commit 85c93fa
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions drivers/char/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -5341,6 +5341,17 @@ static void __devexit cy_pci_release(struct pci_dev *pdev)
struct cyclades_card *cinfo = pci_get_drvdata(pdev);
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);
if (cinfo->ctl_addr)
pci_iounmap(pdev, cinfo->ctl_addr);
Expand Down Expand Up @@ -5560,6 +5571,8 @@ static void __exit cy_cleanup_module(void)
cy_pci_release(cy_card[i].pdev);
continue;
}
/* clear interrupt */
cy_writeb(cy_card[i].base_addr + Cy_ClrIntr, 0);
iounmap(cy_card[i].base_addr);
if (cy_card[i].ctl_addr)
iounmap(cy_card[i].ctl_addr);
Expand Down

0 comments on commit 85c93fa

Please sign in to comment.