Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ace08c3c authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 07a2039b

drivers/char/cyclades.c

+5 −8
Original line number Diff line number Diff line
@@ -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) {