leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty:cyclades, load firmware even on Ze

Browse Source 
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>
This commit is contained in:
Jiri Slaby 2009-06-11 12:20:38 +01:00 committed by Linus Torvalds
parent 07a2039b8e
commit ace08c3c44
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/char/cyclades.c
View File

@ -5043,6 +5043,7 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
nchan = ZE_V1_NPORTS; nchan = ZE_V1_NPORTS;
} else { } else {
card_name = "Cyclades-8Zo"; card_name = "Cyclades-8Zo";
nchan = 8;
#ifdef CY_PCI_DEBUG #ifdef CY_PCI_DEBUG
if (mailbox == ZO_V1) { 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)) if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
cy_writel(addr2 + ID_ADDRESS, 0L); 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) { if ((cy_next_channel + nchan) > NR_PORTS) {