tty: cyclades, don't kill FW
authorJiri Slaby <jirislaby@gmail.com>
Thu, 11 Jun 2009 11:21:30 +0000 (12:21 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jun 2009 15:50:56 +0000 (08:50 -0700)
Don't reset the PLX chip after FW load, which effectively kills
the FW, so that user had to boot manually.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/cyclades.c

index bde24583bcfcb150e0d7185cfd97499886ba5c87..6d524391e994882dc1ae3c9b3c1f6fb8235a7fbb 100644 (file)
@@ -4932,8 +4932,6 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
        cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) |
                        0x00030800UL);
 
-       plx_init(pdev, irq, ctl_addr);
-
        return 0;
 err_rel:
        release_firmware(fw);