aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-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 1fdb9f657d8f..bde24583bcfc 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,
5043 nchan = ZE_V1_NPORTS; 5043 nchan = ZE_V1_NPORTS;
5044 } else { 5044 } else {
5045 card_name = "Cyclades-8Zo"; 5045 card_name = "Cyclades-8Zo";
5046 nchan = 8;
5046 5047
5047#ifdef CY_PCI_DEBUG 5048#ifdef CY_PCI_DEBUG
5048 if (mailbox == ZO_V1) { 5049 if (mailbox == ZO_V1) {
@@ -5065,15 +5066,11 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
5065 */ 5066 */
5066 if ((mailbox == ZO_V1) || (mailbox == ZO_V2)) 5067 if ((mailbox == ZO_V1) || (mailbox == ZO_V2))
5067 cy_writel(addr2 + ID_ADDRESS, 0L); 5068 cy_writel(addr2 + ID_ADDRESS, 0L);
5068
5069 retval = cyz_load_fw(pdev, addr2, addr0, irq);
5070 if (retval)
5071 goto err_unmap;
5072 /* This must be a Cyclades-8Zo/PCI. The extendable
5073 version will have a different device_id and will
5074 be allocated its maximum number of ports. */
5075 nchan = 8;
5076 } 5069 }
5070
5071 retval = cyz_load_fw(pdev, addr2, addr0, irq);
5072 if (retval)
5073 goto err_unmap;
5077 } 5074 }
5078 5075
5079 if ((cy_next_channel + nchan) > NR_PORTS) { 5076 if ((cy_next_channel + nchan) > NR_PORTS) {