diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-11 07:21:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:50:56 -0400 |
commit | eca1b592d600bb2b7d24b66e4106de1e751ae510 (patch) | |
tree | ceed992369cafef84896b5c2f655004837ad05d3 /drivers/char/cyclades.c | |
parent | ace08c3c4403140e5ce82116c8f2acb38f58f61d (diff) |
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.c | 2 |
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, | |||
4932 | cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) | | 4932 | cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) | |
4933 | 0x00030800UL); | 4933 | 0x00030800UL); |
4934 | 4934 | ||
4935 | plx_init(pdev, irq, ctl_addr); | ||
4936 | |||
4937 | return 0; | 4935 | return 0; |
4938 | err_rel: | 4936 | err_rel: |
4939 | release_firmware(fw); | 4937 | release_firmware(fw); |