summaryrefslogtreecommitdiffstats
path: root/drivers/char/cyclades.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-06-11 12:21:30 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 08:50:56 -0700
commiteca1b592d600bb2b7d24b66e4106de1e751ae510 (patch)
treeceed992369cafef84896b5c2f655004837ad05d3 /drivers/char/cyclades.c
parentace08c3c4403140e5ce82116c8f2acb38f58f61d (diff)
downloadlinux-eca1b592d600bb2b7d24b66e4106de1e751ae510.tar.bz2
tty: cyclades, don't kill FW
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>
Diffstat (limited to 'drivers/char/cyclades.c')
-rw-r--r--drivers/char/cyclades.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index bde24583bcfc..6d524391e994 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -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);