From f9ee5f4d3a7b60e3e8b04f8663f4d1394724ae64 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 8 May 2007 00:36:22 -0700 Subject: [PATCH] --- yaml --- r: 54843 b: refs/heads/master c: 6ad1ccc196f76833f41b187e01a28a024fe11f8b h: refs/heads/master i: 54841: 136e218ab8a1b5f4e08b87ba3f05f64def3e3981 54839: 70b94c761b28b8ff8b0cf377c6c0624ec400a3bd v: v3 --- [refs] | 2 +- trunk/drivers/char/cyclades.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab86d927f6c0..0f1925598fee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dacf3b2f0cc657a5621e7f6d67ed27ce598f405 +refs/heads/master: 6ad1ccc196f76833f41b187e01a28a024fe11f8b diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c index 970d99a69a2b..4434c1347221 100644 --- a/trunk/drivers/char/cyclades.c +++ b/trunk/drivers/char/cyclades.c @@ -4841,6 +4841,9 @@ static int __init cy_detect_isa(void) cy_isa_irq); printk("%d channels starting from port %d.\n", cy_isa_nchan, cy_next_channel); + for (j = cy_next_channel; + j < cy_next_channel + cy_isa_nchan; j++) + tty_register_device(cy_serial_driver, j, NULL); cy_next_channel += cy_isa_nchan; } return nboard; @@ -4948,6 +4951,8 @@ static int __devinit cy_init_Ze(unsigned long cy_pci_phys0, printk("%d channels starting from port %d.\n", cy_pci_nchan, cy_next_channel); + for (j = cy_next_channel; j < cy_next_channel + cy_pci_nchan; j++) + tty_register_device(cy_serial_driver, j, &pdev->dev); cy_next_channel += cy_pci_nchan; return 0; @@ -5115,6 +5120,9 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, (int)cy_pci_irq); printk("%d channels starting from port %d.\n", cy_pci_nchan, cy_next_channel); + for (j = cy_next_channel; + j < cy_next_channel + cy_pci_nchan; j++) + tty_register_device(cy_serial_driver, j, &pdev->dev); cy_next_channel += cy_pci_nchan; } else if (device_id == PCI_DEVICE_ID_CYCLOM_Z_Lo) { @@ -5282,6 +5290,9 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev, printk("%d channels starting from port %d.\n", cy_pci_nchan, cy_next_channel); + for (j = cy_next_channel; + j < cy_next_channel + cy_pci_nchan; j++) + tty_register_device(cy_serial_driver, j, &pdev->dev); cy_next_channel += cy_pci_nchan; } @@ -5346,6 +5357,9 @@ static void __devexit cy_pci_release(struct pci_dev *pdev) cy_port[i].line = -1; cy_port[i].magic = -1; } + for (i = cinfo->first_line; i < cinfo->first_line + + cinfo->nports; i++) + tty_unregister_device(cy_serial_driver, i); #endif } @@ -5479,7 +5493,7 @@ static int __init cy_init(void) cy_serial_driver->init_termios = tty_std_termios; cy_serial_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; - cy_serial_driver->flags = TTY_DRIVER_REAL_RAW; + cy_serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; tty_set_operations(cy_serial_driver, &cy_ops); retval = tty_register_driver(cy_serial_driver); @@ -5555,6 +5569,10 @@ static void __exit cy_cleanup_module(void) #endif /* CONFIG_CYZ_INTR */ ) free_irq(cy_card[i].irq, &cy_card[i]); + for (e1 = cy_card[i].first_line; + e1 < cy_card[i].first_line + + cy_card[i].nports; e1++) + tty_unregister_device(cy_serial_driver, e1); } } } /* cy_cleanup_module */