TTY: call tty_port_destroy in the rest of drivers

After commit "TTY: move tty buffers to tty_port", the tty buffers are not freed in some drivers. This is because tty_port_destructor is not called whenever a tty_port is freed. This was an assumption I counted with but was unfortunately untrue. So fix the drivers to fulfil this assumption. To be sure, the TTY buffers (and later some stuff) are gone along with the tty_port, we have to call tty_port_destroy at tear-down places. This is mostly where the structure containing a tty_port is freed. This patch does exactly that -- put tty_port_destroy at those places. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

TTY: call tty_port_destroy in the rest of drivers
After commit "TTY: move tty buffers to tty_port", the tty buffers are not freed in some drivers. This is because tty_port_destructor is not called whenever a tty_port is freed. This was an assumption I counted with but was unfortunately untrue. So fix the drivers to fulfil this assumption. To be sure, the TTY buffers (and later some stuff) are gone along with the tty_port, we have to call tty_port_destroy at tear-down places. This is mostly where the structure containing a tty_port is freed. This patch does exactly that -- put tty_port_destroy at those places. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jiri Slaby · Greg Kroah-Hartman
1 parent d0f59141ca
Showing 41 changed files with 139 additions and 40 deletions Side-by-side Diff
arch/alpha/kernel/srmcons.c
arch/ia64/hp/sim/simserial.c
arch/m68k/emu/nfcon.c
arch/parisc/kernel/pdc_cons.c
arch/um/drivers/line.c
arch/xtensa/platforms/iss/console.c
drivers/char/pcmcia/synclink_cs.c
drivers/char/ttyprintk.c
drivers/isdn/gigaset/common.c
drivers/isdn/i4l/isdn_tty.c
drivers/misc/pti.c
drivers/net/usb/hso.c
drivers/s390/char/con3215.c
drivers/s390/char/sclp_tty.c
drivers/s390/char/sclp_vt220.c
drivers/s390/char/tty3270.c
drivers/staging/ccg/u_serial.c
drivers/staging/dgrp/dgrp_specproc.c
drivers/staging/dgrp/dgrp_tty.c
drivers/staging/ipack/devices/ipoctal.c
@@ -205,7 +205,6 @@
 static int __init
 srmcons_init(void)
 {
-	tty_port_init(&srmcons_singleton.port);
 	setup_timer(&srmcons_singleton.timer, srmcons_receive_chars,
 			(unsigned long)&srmcons_singleton);
 	if (srm_is_registered_console) {
@@ -215,6 +214,9 @@
 		driver = alloc_tty_driver(MAX_SRM_CONSOLE_DEVICES);
 		if (!driver)
 			return -ENOMEM;
+
+		tty_port_init(&srmcons_singleton.port);
+
 		driver->driver_name = "srm";
 		driver->name = "srm";
 		driver->major = 0; 	/* dynamic */
@@ -227,6 +229,7 @@
 		err = tty_register_driver(driver);
 		if (err) {
 			put_tty_driver(driver);
+			tty_port_destroy(&srmcons_singleton.port);
 			return err;
 		}
 		srmcons_driver = driver;
@@ -555,6 +555,7 @@
 	return 0;
 err_free_tty:
 	put_tty_driver(hp_simserial_driver);
+	tty_port_destroy(&state->port);
 	return retval;
 }
  
@@ -120,8 +120,6 @@
 {
 	int res;
  
-	tty_port_init(&nfcon_tty_port);
-
 	stderr_id = nf_get_id("NF_STDERR");
 	if (!stderr_id)
 		return -ENODEV;
@@ -130,6 +128,8 @@
 	if (!nfcon_tty_driver)
 		return -ENOMEM;
  
+	tty_port_init(&nfcon_tty_port);
+
 	nfcon_tty_driver->driver_name = "nfcon";
 	nfcon_tty_driver->name = "nfcon";
 	nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;
@@ -143,6 +143,7 @@
 	if (res) {
 		pr_err("failed to register nfcon tty driver\n");
 		put_tty_driver(nfcon_tty_driver);
+		tty_port_destroy(&nfcon_tty_port);
 		return res;
 	}
  
@@ -157,6 +158,7 @@
 	unregister_console(&nf_console);
 	tty_unregister_driver(nfcon_tty_driver);
 	put_tty_driver(nfcon_tty_driver);
+	tty_port_destroy(&nfcon_tty_port);
 }
  
 module_init(nfcon_init);
@@ -186,13 +186,13 @@
 	printk(KERN_INFO "The PDC console driver is still registered, removing CON_BOOT flag\n");
 	pdc_cons.flags &= ~CON_BOOT;
  
-	tty_port_init(&tty_port);
-
 	pdc_console_tty_driver = alloc_tty_driver(1);
  
 	if (!pdc_console_tty_driver)
 		return -ENOMEM;
  
+	tty_port_init(&tty_port);
+
 	pdc_console_tty_driver->driver_name = "pdc_cons";
 	pdc_console_tty_driver->name = "ttyB";
 	pdc_console_tty_driver->major = MUX_MAJOR;
@@ -207,6 +207,7 @@
 	err = tty_register_driver(pdc_console_tty_driver);
 	if (err) {
 		printk(KERN_ERR "Unable to register the PDC console TTY driver\n");
+		tty_port_destroy(&tty_port);
 		return err;
 	}
  
@@ -584,6 +584,8 @@
 		printk(KERN_ERR "register_lines : can't register %s driver\n",
 		       line_driver->name);
 		put_tty_driver(driver);
+		for (i = 0; i < nlines; i++)
+			tty_port_destroy(&lines[i].port);
 		return err;
 	}
  
@@ -221,6 +221,7 @@
 		printk("ISS_SERIAL: failed to unregister serial driver (%d)\n",
 		       error);
 	put_tty_driver(serial_driver);
+	tty_port_destroy(&serial_port);
 }
  
  
@@ -549,8 +549,10 @@
     /* Initialize the struct pcmcia_device structure */
  
     ret = mgslpc_config(link);
-    if (ret)
+    if (ret) {
+	    tty_port_destroy(&info->port);
 	    return ret;
+    }
  
     mgslpc_add_device(info);
  
@@ -2757,6 +2759,7 @@
 			hdlcdev_exit(info);
 #endif
 			release_resources(info);
+			tty_port_destroy(&info->port);
 			kfree(info);
 			mgslpc_device_count--;
 			return;
@@ -179,7 +179,6 @@
 {
 	int ret = -ENOMEM;
  
-	tty_port_init(&tpk_port.port);
 	tpk_port.port.ops = &null_ops;
 	mutex_init(&tpk_port.port_write_mutex);
  
@@ -190,6 +189,8 @@
 	if (IS_ERR(ttyprintk_driver))
 		return PTR_ERR(ttyprintk_driver);
  
+	tty_port_init(&tpk_port.port);
+
 	ttyprintk_driver->driver_name = "ttyprintk";
 	ttyprintk_driver->name = "ttyprintk";
 	ttyprintk_driver->major = TTYAUX_MAJOR;
@@ -211,6 +212,7 @@
 error:
 	tty_unregister_driver(ttyprintk_driver);
 	put_tty_driver(ttyprintk_driver);
+	tty_port_destroy(&tpk_port.port);
 	ttyprintk_driver = NULL;
 	return ret;
 }
@@ -518,6 +518,7 @@
 	kfree(cs->bcs);
 f_cs:	gig_dbg(DEBUG_INIT, "freeing cs");
 	mutex_unlock(&cs->mutex);
+	tty_port_destroy(&cs->port);
 	free_cs(cs);
 }
 EXPORT_SYMBOL_GPL(gigaset_freecs);
  
@@ -751,14 +752,14 @@
 	gig_dbg(DEBUG_INIT, "setting up iif");
 	if (gigaset_isdn_regdev(cs, modulename) < 0) {
 		pr_err("error registering ISDN device\n");
-		goto error;
+		goto error_port;
 	}
  
 	make_valid(cs, VALID_ID);
 	++cs->cs_init;
 	gig_dbg(DEBUG_INIT, "setting up hw");
 	if (cs->ops->initcshw(cs) < 0)
-		goto error;
+		goto error_port;
  
 	++cs->cs_init;
  
@@ -773,7 +774,7 @@
 		gig_dbg(DEBUG_INIT, "setting up bcs[%d]", i);
 		if (gigaset_initbcs(cs->bcs + i, cs, i) < 0) {
 			pr_err("could not allocate channel %d data\n", i);
-			goto error;
+			goto error_port;
 		}
 	}
  
@@ -786,7 +787,8 @@
  
 	gig_dbg(DEBUG_INIT, "cs initialized");
 	return cs;
-
+error_port:
+	tty_port_destroy(&cs->port);
 error:
 	gig_dbg(DEBUG_INIT, "failed");
 	gigaset_freecs(cs);
@@ -1849,6 +1849,8 @@
 		kfree(info->fax);
 #endif
 		kfree(info->port.xmit_buf - 4);
+		info->port.xmit_buf = NULL;
+		tty_port_destroy(&info->port);
 	}
 	tty_unregister_driver(m->tty_modem);
 err:
@@ -1870,6 +1872,8 @@
 		kfree(info->fax);
 #endif
 		kfree(info->port.xmit_buf - 4);
+		info->port.xmit_buf = NULL;
+		tty_port_destroy(&info->port);
 	}
 	tty_unregister_driver(dev->mdm.tty_modem);
 	put_tty_driver(dev->mdm.tty_modem);
@@ -882,11 +882,14 @@
 static void __devexit pti_pci_remove(struct pci_dev *pdev)
 {
 	struct pti_dev *drv_data = pci_get_drvdata(pdev);
+	unsigned int a;
  
 	unregister_console(&pti_console);
  
-	tty_unregister_device(pti_tty_driver, 0);
-	tty_unregister_device(pti_tty_driver, 1);
+	for (a = 0; a < PTITTY_MINOR_NUM; a++) {
+		tty_unregister_device(pti_tty_driver, a);
+		tty_port_destroy(&drv_data->port[a]);
+	}
  
 	iounmap(drv_data->pti_ioaddr);
 	pci_set_drvdata(pdev, NULL);
@@ -2274,6 +2274,7 @@
 	/* unlink and free TX URB */
 	usb_free_urb(serial->tx_urb);
 	kfree(serial->tx_data);
+	tty_port_destroy(&serial->port);
 }
  
 static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
  
@@ -2283,11 +2284,11 @@
 	int minor;
 	int i;
  
+	tty_port_init(&serial->port);
+
 	minor = get_free_serial_index();
 	if (minor < 0)
 		goto exit;
-
-	tty_port_init(&serial->port);
  
 	/* register our minor number */
 	serial->parent->dev = tty_port_register_device(&serial->port, tty_drv,
@@ -677,6 +677,7 @@
 {
 	kfree(raw->inbuf);
 	kfree(raw->buffer);
+	tty_port_destroy(&raw->port);
 	kfree(raw);
 }
  
@@ -547,7 +547,6 @@
 		sclp_tty_tolower = 1;
 	}
 	sclp_tty_chars_count = 0;
-	tty_port_init(&sclp_port);
  
 	rc = sclp_register(&sclp_input_event);
 	if (rc) {
@@ -555,6 +554,8 @@
 		return rc;
 	}
  
+	tty_port_init(&sclp_port);
+
 	driver->driver_name = "sclp_line";
 	driver->name = "sclp_line";
 	driver->major = TTY_MAJOR;
@@ -571,6 +572,7 @@
 	rc = tty_register_driver(driver);
 	if (rc) {
 		put_tty_driver(driver);
+		tty_port_destroy(&sclp_port);
 		return rc;
 	}
 	sclp_tty_driver = driver;
@@ -615,6 +615,7 @@
 		return;
 	sclp_unregister(&sclp_vt220_register);
 	__sclp_vt220_free_pages();
+	tty_port_destroy(&sclp_vt220_port);
 }
  
 /* Allocate buffer pages and register with sclp core. Controlled by init
@@ -650,6 +651,7 @@
 	if (rc) {
 		__sclp_vt220_free_pages();
 		sclp_vt220_init_count--;
+		tty_port_destroy(&sclp_vt220_port);
 	}
 	return rc;
 }
@@ -722,6 +722,7 @@
 	while (pages--)
 		free_pages((unsigned long) tp->freemem_pages[pages], 0);
 	kfree(tp->freemem_pages);
+	tty_port_destroy(&tp->port);
 out_tp:
 	kfree(tp);
 out_err:
@@ -744,6 +745,7 @@
 	for (pages = 0; pages < TTY3270_STRING_PAGES; pages++)
 		free_pages((unsigned long) tp->freemem_pages[pages], 0);
 	kfree(tp->freemem_pages);
+	tty_port_destroy(&tp->port);
 	kfree(tp);
 }
  
@@ -1140,8 +1140,10 @@
  
 	return status;
 fail:
-	while (count--)
+	while (count--) {
+		tty_port_destroy(&ports[count].port->port);
 		kfree(ports[count].port);
+	}
 	put_tty_driver(gs_tty_driver);
 	gs_tty_driver = NULL;
 	return status;
@@ -1195,6 +1197,7 @@
  
 		WARN_ON(port->port_usb != NULL);
  
+		tty_port_destroy(&port->port);
 		kfree(port);
 	}
 	n_ports = 0;
@@ -752,6 +752,8 @@
  
 	return 0;
  
+	/* FIXME this guy should free the tty driver stored in nd and destroy
+	 * all channel ports */
 error_out:
 	kfree(nd);
 	return ret;
@@ -3119,6 +3119,7 @@
 void
 dgrp_tty_uninit(struct nd_struct *nd)
 {
+	unsigned int i;
 	char id[3];
  
 	ID_TO_CHAR(nd->nd_ID, id);
@@ -3152,6 +3153,8 @@
 		put_tty_driver(nd->nd_xprint_ttdriver);
 		nd->nd_ttdriver_flags &= ~XPRINT_TTDRV_REG;
 	}
+	for (i = 0; i < CHAN_MAX; i++)
+		tty_port_destroy(&nd->nd_chan[i].port);
 }
  
  
@@ -3334,7 +3337,6 @@
  
 		init_waitqueue_head(&(ch->ch_pun.un_open_wait));
 		init_waitqueue_head(&(ch->ch_pun.un_close_wait));
-		tty_port_init(&ch->port);
 		tty_port_init(&ch->port);
 	}
 	return 0;
@@ -446,6 +446,7 @@
 		tty_dev = tty_port_register_device(&channel->tty_port, tty, i, NULL);
 		if (IS_ERR(tty_dev)) {
 			dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n");
+			tty_port_destroy(&channel->tty_port);
 			continue;
 		}
 		dev_set_drvdata(tty_dev, channel);
@@ -741,6 +742,7 @@
 		struct ipoctal_channel *channel = &ipoctal->channel[i];
 		tty_unregister_device(ipoctal->tty_drv, i);
 		tty_port_free_xmit_buf(&channel->tty_port);
+		tty_port_destroy(&channel->tty_port);
 	}
  
 	tty_unregister_driver(ipoctal->tty_drv);
@@ -1771,6 +1771,7 @@
 fail_unregister:
 	tty_unregister_driver(serial_driver);
 fail_put_tty_driver:
+	tty_port_destroy(&state->tport);
 	put_tty_driver(serial_driver);
 	return error;
 }
@@ -1785,6 +1786,7 @@
 		printk("SERIAL: failed to unregister serial driver (%d)\n",
 		       error);
 	put_tty_driver(serial_driver);
+	tty_port_destroy(&state->tport);
  
 	free_irq(IRQ_AMIGA_TBE, state);
 	free_irq(IRQ_AMIGA_RBF, state);
@@ -240,8 +240,6 @@
 {
 	int ret;
  
-	tty_port_init(&port);
-
 	bfin_jc_kthread = kthread_create(bfin_jc_emudat_manager, NULL, DRV_NAME);
 	if (IS_ERR(bfin_jc_kthread))
 		return PTR_ERR(bfin_jc_kthread);
@@ -257,6 +255,8 @@
 	if (!bfin_jc_driver)
 		goto err_driver;
  
+	tty_port_init(&port);
+
 	bfin_jc_driver->driver_name  = DRV_NAME;
 	bfin_jc_driver->name         = DEV_NAME;
 	bfin_jc_driver->type         = TTY_DRIVER_TYPE_SERIAL;
@@ -274,6 +274,7 @@
 	return 0;
  
  err:
+	tty_port_destroy(&port);
 	put_tty_driver(bfin_jc_driver);
  err_driver:
 	kfree(bfin_jc_write_buf.buf);
@@ -289,6 +290,7 @@
 	kfree(bfin_jc_write_buf.buf);
 	tty_unregister_driver(bfin_jc_driver);
 	put_tty_driver(bfin_jc_driver);
+	tty_port_destroy(&port);
 }
 module_exit(bfin_jc_exit);
  
@@ -3934,7 +3934,7 @@
 static void __devexit cy_pci_remove(struct pci_dev *pdev)
 {
 	struct cyclades_card *cinfo = pci_get_drvdata(pdev);
-	unsigned int i;
+	unsigned int i, channel;
  
 	/* non-Z with old PLX */
 	if (!cy_is_Z(cinfo) && (readb(cinfo->base_addr + CyPLX_VER) & 0x0f) ==
  
@@ -3960,9 +3960,11 @@
 	pci_release_regions(pdev);
  
 	cinfo->base_addr = NULL;
-	for (i = cinfo->first_line; i < cinfo->first_line +
-			cinfo->nports; i++)
+	for (channel = 0, i = cinfo->first_line; i < cinfo->first_line +
+			cinfo->nports; i++, channel++) {
 		tty_unregister_device(cy_serial_driver, i);
+		tty_port_destroy(&cinfo->ports[channel].port);
+	}
 	cinfo->nports = 0;
 	kfree(cinfo->ports);
 }
@@ -757,6 +757,7 @@
 	return 0;
  
 error:
+	tty_port_destroy(&bc->port);
 	irq_dispose_mapping(bc->tx_irq);
 	irq_dispose_mapping(bc->rx_irq);
  
@@ -770,6 +771,7 @@
  
 	tty_unregister_device(ehv_bc_driver, bc - bcs);
  
+	tty_port_destroy(&bc->port);
 	irq_dispose_mapping(bc->tx_irq);
 	irq_dispose_mapping(bc->rx_irq);
  
@@ -1218,6 +1218,7 @@
 		if (hp->virq == 0) {
 			printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
 				__func__, irq[0]);
+			tty_port_destroy(&hp->port);
 			continue;
 		}
  
@@ -566,6 +566,7 @@
 			ipwireless_disassociate_network_ttys(network,
 							     ttyj->channel_idx);
 			tty_unregister_device(ipw_tty_driver, j);
+			tty_port_destroy(&ttyj->port);
 			ttys[j] = NULL;
 			mutex_unlock(&ttyj->ipw_tty_mutex);
 			kfree(ttyj);
@@ -895,6 +895,8 @@
  
 	return 0;
 err_free:
+	for (i = 0; i < MAX_PORTS_PER_BOARD; i++)
+		tty_port_destroy(&brd->ports[i].port);
 	kfree(brd->ports);
 err:
 	return ret;
@@ -919,6 +921,8 @@
 				tty_kref_put(tty);
 			}
 		}
+	for (a = 0; a < MAX_PORTS_PER_BOARD; a++)
+		tty_port_destroy(&brd->ports[a].port);
 	while (1) {
 		opened = 0;
 		for (a = 0; a < brd->numPorts; a++)
@@ -2411,14 +2411,27 @@
  
 	retval = request_irq(brd->irq, mxser_interrupt, IRQF_SHARED, "mxser",
 			brd);
-	if (retval)
+	if (retval) {
+		for (i = 0; i < brd->info->nports; i++)
+			tty_port_destroy(&brd->ports[i].port);
 		printk(KERN_ERR "Board %s: Request irq failed, IRQ (%d) may "
 			"conflict with another device.\n",
 			brd->info->name, brd->irq);
+	}
  
 	return retval;
 }
  
+static void mxser_board_remove(struct mxser_board *brd)
+{
+	unsigned int i;
+
+	for (i = 0; i < brd->info->nports; i++) {
+		tty_unregister_device(mxvar_sdriver, brd->idx + i);
+		tty_port_destroy(&brd->ports[i].port);
+	}
+}
+
 static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)
 {
 	int id, i, bits, ret;
  
@@ -2649,10 +2662,8 @@
 {
 #ifdef CONFIG_PCI
 	struct mxser_board *brd = pci_get_drvdata(pdev);
-	unsigned int i;
  
-	for (i = 0; i < brd->info->nports; i++)
-		tty_unregister_device(mxvar_sdriver, brd->idx + i);
+	mxser_board_remove(brd);
  
 	free_irq(pdev->irq, brd);
 	pci_release_region(pdev, 2);
  
@@ -2748,15 +2759,13 @@
  
 static void __exit mxser_module_exit(void)
 {
-	unsigned int i, j;
+	unsigned int i;
  
 	pci_unregister_driver(&mxser_driver);
  
 	for (i = 0; i < MXSER_BOARDS; i++) /* ISA remains */
 		if (mxser_boards[i].info != NULL)
-			for (j = 0; j < mxser_boards[i].info->nports; j++)
-				tty_unregister_device(mxvar_sdriver,
-						mxser_boards[i].idx + j);
+			mxser_board_remove(&mxser_boards[i]);
 	tty_unregister_driver(mxvar_sdriver);
 	put_tty_driver(mxvar_sdriver);
  
@@ -1479,6 +1479,7 @@
 		if (IS_ERR(tty_dev)) {
 			ret = PTR_ERR(tty_dev);
 			dev_err(&pdev->dev, "Could not allocate tty?\n");
+			tty_port_destroy(&port->port);
 			goto err_free_tty;
 		}
 	}
@@ -1486,8 +1487,10 @@
 	return 0;
  
 err_free_tty:
-	for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)
-		tty_unregister_device(ntty_driver, i);
+	for (i = 0; i < MAX_PORT; ++i) {
+		tty_unregister_device(ntty_driver, dc->index_start + i);
+		tty_port_destroy(&dc->port[i].port);
+	}
 err_free_kfifo:
 	for (i = 0; i < MAX_PORT; i++)
 		kfifo_free(&dc->port[i].fifo_ul);
@@ -1520,8 +1523,10 @@
 	   complete off a hangup method ? */
 	while (dc->open_ttys)
 		msleep(1);
-	for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)
-		tty_unregister_device(ntty_driver, i);
+	for (i = 0; i < MAX_PORT; ++i) {
+		tty_unregister_device(ntty_driver, dc->index_start + i);
+		tty_port_destroy(&dc->port[i].port);
+	}
 }
  
 /* Deallocate memory for one device */
@@ -673,6 +673,7 @@
 	if (sInitChan(ctlp, &info->channel, aiop, chan) == 0) {
 		printk(KERN_ERR "RocketPort sInitChan(%d, %d, %d) failed!\n",
 				board, aiop, chan);
+		tty_port_destroy(&info->port);
 		kfree(info);
 		return;
 	}
@@ -2357,6 +2358,7 @@
 	for (i = 0; i < MAX_RP_PORTS; i++)
 		if (rp_table[i]) {
 			tty_unregister_device(rocket_driver, i);
+			tty_port_destroy(&rp_table[i]->port);
 			kfree(rp_table[i]);
 		}
  
@@ -1225,6 +1225,8 @@
  
 	if (tty_register_driver(serial_driver)) {
 		put_tty_driver(serial_driver);
+		for (i = 0; i < NR_PORTS; i++)
+			tty_port_destroy(&m68k_soft[i].tport);
 		printk(KERN_ERR "Couldn't register serial driver\n");
 		return -ENOMEM;
 	}
@@ -829,6 +829,7 @@
 {
 	if (ifx_dev->tty_dev)
 		tty_unregister_device(tty_drv, ifx_dev->minor);
+	tty_port_destroy(&ifx_dev->tty_port);
 	kfifo_free(&ifx_dev->tx_fifo);
 }
  
  
@@ -862,10 +863,12 @@
 		dev_dbg(&ifx_dev->spi_dev->dev,
 			"%s: registering tty device failed", __func__);
 		ret = PTR_ERR(ifx_dev->tty_dev);
-		goto error_ret;
+		goto error_port;
 	}
 	return 0;
  
+error_port:
+	tty_port_destroy(pport);
 error_ret:
 	ifx_spi_free_port(ifx_dev);
 	return ret;
@@ -266,6 +266,7 @@
 	}
 	return 0;
 err:
+	tty_port_destroy(&priv->port);
 	kfree(priv);
 	return ret;
 }
@@ -275,6 +276,7 @@
 	struct kgdb_nmi_tty_priv *priv = tty->driver_data;
  
 	tty->driver_data = NULL;
+	tty_port_destroy(&priv->port);
 	kfree(priv);
 }
  
@@ -2297,6 +2297,8 @@
 	if (retval >= 0)
 		return retval;
  
+	for (i = 0; i < drv->nr; i++)
+		tty_port_destroy(&drv->state[i].port);
 	put_tty_driver(normal);
 out_kfree:
 	kfree(drv->state);
  
@@ -2316,8 +2318,12 @@
 void uart_unregister_driver(struct uart_driver *drv)
 {
 	struct tty_driver *p = drv->tty_driver;
+	unsigned int i;
+
 	tty_unregister_driver(p);
 	put_tty_driver(p);
+	for (i = 0; i < drv->nr; i++)
+		tty_port_destroy(&drv->state[i].port);
 	kfree(drv->state);
 	drv->state = NULL;
 	drv->tty_driver = NULL;
@@ -4425,6 +4425,7 @@
 		mgsl_release_resources(info);
 		tmp = info;
 		info = info->next_device;
+		tty_port_destroy(&tmp->port);
 		kfree(tmp);
 	}
  
@@ -3645,8 +3645,10 @@
 	for (i=0; i < port_count; ++i) {
 		port_array[i] = alloc_dev(adapter_num, i, pdev);
 		if (port_array[i] == NULL) {
-			for (--i; i >= 0; --i)
+			for (--i; i >= 0; --i) {
+				tty_port_destroy(&port_array[i]->port);
 				kfree(port_array[i]);
+			}
 			return;
 		}
 	}
@@ -3773,6 +3775,7 @@
 			release_resources(info);
 		tmp = info;
 		info = info->next_device;
+		tty_port_destroy(&tmp->port);
 		kfree(tmp);
 	}
  
@@ -3843,8 +3843,10 @@
 	for ( port = 0; port < SCA_MAX_PORTS; ++port ) {
 		port_array[port] = alloc_dev(adapter_num,port,pdev);
 		if( port_array[port] == NULL ) {
-			for ( --port; port >= 0; --port )
+			for (--port; port >= 0; --port) {
+				tty_port_destroy(&port_array[port]->port);
 				kfree(port_array[port]);
+			}
 			return;
 		}
 	}
@@ -3953,6 +3955,7 @@
 		}
 		tmp = info;
 		info = info->next_device;
+		tty_port_destroy(&tmp->port);
 		kfree(tmp);
 	}
  
@@ -779,6 +779,7 @@
 		con_set_default_unimap(vc);
 	    vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
 	    if (!vc->vc_screenbuf) {
+		tty_port_destroy(&vc->port);
 		kfree(vc);
 		vc_cons[currcons].d = NULL;
 		return -ENOMEM;
  
@@ -999,8 +1000,10 @@
 		put_pid(vc->vt_pid);
 		module_put(vc->vc_sw->owner);
 		kfree(vc->vc_screenbuf);
-		if (currcons >= MIN_NR_CONSOLES)
+		if (currcons >= MIN_NR_CONSOLES) {
+			tty_port_destroy(&vc->port);
 			kfree(vc);
+		}
 		vc_cons[currcons].d = NULL;
 	}
 }
@@ -1145,8 +1145,10 @@
  
 	return status;
 fail:
-	while (count--)
+	while (count--) {
+		tty_port_destroy(&ports[count].port->port);
 		kfree(ports[count].port);
+	}
 	put_tty_driver(gs_tty_driver);
 	gs_tty_driver = NULL;
 	return status;
@@ -1200,6 +1202,7 @@
  
 		WARN_ON(port->port_usb != NULL);
  
+		tty_port_destroy(&port->port);
 		kfree(port);
 	}
 	n_ports = 0;
@@ -597,6 +597,7 @@
 	kfifo_free(&port->write_fifo);
 	kfree(port->interrupt_in_buffer);
 	kfree(port->interrupt_out_buffer);
+	tty_port_destroy(&port->port);
 	kfree(port);
 }
  
@@ -183,6 +183,7 @@
 	ircomm_tty_shutdown(self);
  
 	self->magic = 0;
+	tty_port_destroy(&self->port);
 	kfree(self);
 }
...	...	@@ -205,7 +205,6 @@
205	205	static int __init
206	206	srmcons_init(void)
207	207	{
208		- tty_port_init(&srmcons_singleton.port);
209	208	setup_timer(&srmcons_singleton.timer, srmcons_receive_chars,
210	209	(unsigned long)&srmcons_singleton);
211	210	if (srm_is_registered_console) {
...	...	@@ -215,6 +214,9 @@
215	214	driver = alloc_tty_driver(MAX_SRM_CONSOLE_DEVICES);
216	215	if (!driver)
217	216	return -ENOMEM;
	217	+
	218	+ tty_port_init(&srmcons_singleton.port);
	219	+
218	220	driver->driver_name = "srm";
219	221	driver->name = "srm";
220	222	driver->major = 0; /* dynamic */
...	...	@@ -227,6 +229,7 @@
227	229	err = tty_register_driver(driver);
228	230	if (err) {
229	231	put_tty_driver(driver);
	232	+ tty_port_destroy(&srmcons_singleton.port);
230	233	return err;
231	234	}
232	235	srmcons_driver = driver;
...	...	@@ -555,6 +555,7 @@
555	555	return 0;
556	556	err_free_tty:
557	557	put_tty_driver(hp_simserial_driver);
	558	+ tty_port_destroy(&state->port);
558	559	return retval;
559	560	}
560	561
...	...	@@ -120,8 +120,6 @@
120	120	{
121	121	int res;
122	122
123		- tty_port_init(&nfcon_tty_port);
124		-
125	123	stderr_id = nf_get_id("NF_STDERR");
126	124	if (!stderr_id)
127	125	return -ENODEV;
...	...	@@ -130,6 +128,8 @@
130	128	if (!nfcon_tty_driver)
131	129	return -ENOMEM;
132	130
	131	+ tty_port_init(&nfcon_tty_port);
	132	+
133	133	nfcon_tty_driver->driver_name = "nfcon";
134	134	nfcon_tty_driver->name = "nfcon";
135	135	nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;
...	...	@@ -143,6 +143,7 @@
143	143	if (res) {
144	144	pr_err("failed to register nfcon tty driver\n");
145	145	put_tty_driver(nfcon_tty_driver);
	146	+ tty_port_destroy(&nfcon_tty_port);
146	147	return res;
147	148	}
148	149
...	...	@@ -157,6 +158,7 @@
157	158	unregister_console(&nf_console);
158	159	tty_unregister_driver(nfcon_tty_driver);
159	160	put_tty_driver(nfcon_tty_driver);
	161	+ tty_port_destroy(&nfcon_tty_port);
160	162	}
161	163
162	164	module_init(nfcon_init);
...	...	@@ -186,13 +186,13 @@
186	186	printk(KERN_INFO "The PDC console driver is still registered, removing CON_BOOT flag\n");
187	187	pdc_cons.flags &= ~CON_BOOT;
188	188
189		- tty_port_init(&tty_port);
190		-
191	189	pdc_console_tty_driver = alloc_tty_driver(1);
192	190
193	191	if (!pdc_console_tty_driver)
194	192	return -ENOMEM;
195	193
	194	+ tty_port_init(&tty_port);
	195	+
196	196	pdc_console_tty_driver->driver_name = "pdc_cons";
197	197	pdc_console_tty_driver->name = "ttyB";
198	198	pdc_console_tty_driver->major = MUX_MAJOR;
...	...	@@ -207,6 +207,7 @@
207	207	err = tty_register_driver(pdc_console_tty_driver);
208	208	if (err) {
209	209	printk(KERN_ERR "Unable to register the PDC console TTY driver\n");
	210	+ tty_port_destroy(&tty_port);
210	211	return err;
211	212	}
212	213
...	...	@@ -584,6 +584,8 @@
584	584	printk(KERN_ERR "register_lines : can't register %s driver\n",
585	585	line_driver->name);
586	586	put_tty_driver(driver);
	587	+ for (i = 0; i < nlines; i++)
	588	+ tty_port_destroy(&lines[i].port);
587	589	return err;
588	590	}
589	591
...	...	@@ -221,6 +221,7 @@
221	221	printk("ISS_SERIAL: failed to unregister serial driver (%d)\n",
222	222	error);
223	223	put_tty_driver(serial_driver);
	224	+ tty_port_destroy(&serial_port);
224	225	}
225	226
226	227
...	...	@@ -549,8 +549,10 @@
549	549	/* Initialize the struct pcmcia_device structure */
550	550
551	551	ret = mgslpc_config(link);
552		- if (ret)
	552	+ if (ret) {
	553	+ tty_port_destroy(&info->port);
553	554	return ret;
	555	+ }
554	556
555	557	mgslpc_add_device(info);
556	558
...	...	@@ -2757,6 +2759,7 @@
2757	2759	hdlcdev_exit(info);
2758	2760	#endif
2759	2761	release_resources(info);
	2762	+ tty_port_destroy(&info->port);
2760	2763	kfree(info);
2761	2764	mgslpc_device_count--;
2762	2765	return;
...	...	@@ -179,7 +179,6 @@
179	179	{
180	180	int ret = -ENOMEM;
181	181
182		- tty_port_init(&tpk_port.port);
183	182	tpk_port.port.ops = &null_ops;
184	183	mutex_init(&tpk_port.port_write_mutex);
185	184
...	...	@@ -190,6 +189,8 @@
190	189	if (IS_ERR(ttyprintk_driver))
191	190	return PTR_ERR(ttyprintk_driver);
192	191
	192	+ tty_port_init(&tpk_port.port);
	193	+
193	194	ttyprintk_driver->driver_name = "ttyprintk";
194	195	ttyprintk_driver->name = "ttyprintk";
195	196	ttyprintk_driver->major = TTYAUX_MAJOR;
...	...	@@ -211,6 +212,7 @@
211	212	error:
212	213	tty_unregister_driver(ttyprintk_driver);
213	214	put_tty_driver(ttyprintk_driver);
	215	+ tty_port_destroy(&tpk_port.port);
214	216	ttyprintk_driver = NULL;
215	217	return ret;
216	218	}
...	...	@@ -518,6 +518,7 @@
518	518	kfree(cs->bcs);
519	519	f_cs: gig_dbg(DEBUG_INIT, "freeing cs");
520	520	mutex_unlock(&cs->mutex);
	521	+ tty_port_destroy(&cs->port);
521	522	free_cs(cs);
522	523	}
523	524	EXPORT_SYMBOL_GPL(gigaset_freecs);
524	525
...	...	@@ -751,14 +752,14 @@
751	752	gig_dbg(DEBUG_INIT, "setting up iif");
752	753	if (gigaset_isdn_regdev(cs, modulename) < 0) {
753	754	pr_err("error registering ISDN device\n");
754		- goto error;
	755	+ goto error_port;
755	756	}
756	757
757	758	make_valid(cs, VALID_ID);
758	759	++cs->cs_init;
759	760	gig_dbg(DEBUG_INIT, "setting up hw");
760	761	if (cs->ops->initcshw(cs) < 0)
761		- goto error;
	762	+ goto error_port;
762	763
763	764	++cs->cs_init;
764	765
...	...	@@ -773,7 +774,7 @@
773	774	gig_dbg(DEBUG_INIT, "setting up bcs[%d]", i);
774	775	if (gigaset_initbcs(cs->bcs + i, cs, i) < 0) {
775	776	pr_err("could not allocate channel %d data\n", i);
776		- goto error;
	777	+ goto error_port;
777	778	}
778	779	}
779	780
...	...	@@ -786,7 +787,8 @@
786	787
787	788	gig_dbg(DEBUG_INIT, "cs initialized");
788	789	return cs;
789		-
	790	+error_port:
	791	+ tty_port_destroy(&cs->port);
790	792	error:
791	793	gig_dbg(DEBUG_INIT, "failed");
792	794	gigaset_freecs(cs);
...	...	@@ -1849,6 +1849,8 @@
1849	1849	kfree(info->fax);
1850	1850	#endif
1851	1851	kfree(info->port.xmit_buf - 4);
	1852	+ info->port.xmit_buf = NULL;
	1853	+ tty_port_destroy(&info->port);
1852	1854	}
1853	1855	tty_unregister_driver(m->tty_modem);
1854	1856	err:
...	...	@@ -1870,6 +1872,8 @@
1870	1872	kfree(info->fax);
1871	1873	#endif
1872	1874	kfree(info->port.xmit_buf - 4);
	1875	+ info->port.xmit_buf = NULL;
	1876	+ tty_port_destroy(&info->port);
1873	1877	}
1874	1878	tty_unregister_driver(dev->mdm.tty_modem);
1875	1879	put_tty_driver(dev->mdm.tty_modem);