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>
This commit is contained in:
parent
07a2039b8e
commit
ace08c3c44
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
if ((cy_next_channel + nchan) > NR_PORTS) {
|
||||
|
|
Loading…
Reference in a new issue