summaryrefslogtreecommitdiff
path: root/drivers/char/cyclades.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-06-11 12:20:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 08:50:56 -0700
commitace08c3c4403140e5ce82116c8f2acb38f58f61d (patch)
tree042232ee1599e22a4c680ac49391f99ae24bab2f /drivers/char/cyclades.c
parent07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff)
downloadlinux-3.10-ace08c3c4403140e5ce82116c8f2acb38f58f61d.tar.gz
linux-3.10-ace08c3c4403140e5ce82116c8f2acb38f58f61d.tar.bz2
linux-3.10-ace08c3c4403140e5ce82116c8f2acb38f58f61d.zip
tty:cyclades, load firmware even on Ze
Ze needs firmware to be loaded as well as Zo. Move cyz_load_fw one level upper to achieve that. 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.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 1fdb9f657d8..bde24583bcf 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -5043,6 +5043,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
nchan = ZE_V1_NPORTS;
} else {
card_name = "Cyclades-8Zo";
+ nchan = 8;
#ifdef CY_PCI_DEBUG
if (mailbox == ZO_V1) {
@@ -5065,15 +5066,11 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
*/
if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
cy_writel(addr2 + ID_ADDRESS, 0L);
-
- retval = cyz_load_fw(pdev, addr2, addr0, irq);
- if (retval)
- goto err_unmap;
- /* This must be a Cyclades-8Zo/PCI. The extendable
- version will have a different device_id and will
- be allocated its maximum number of ports. */
- nchan = 8;
}
+
+ retval = cyz_load_fw(pdev, addr2, addr0, irq);
+ if (retval)
+ goto err_unmap;
}
if ((cy_next_channel + nchan) > NR_PORTS) {