Commit a66369a5 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: dgap: move tty_port_init() for serial_ports.



If printer_ports which is allocated after serial_ports is failed
to allocate, tty_port_init for serial_ports doesn't need anymore.
So move this after allocating memory for printer_ports.

Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ade4a34
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -4142,16 +4142,16 @@ static int dgap_tty_register_ports(struct board_t *brd)
					GFP_KERNEL);
	if (brd->serial_ports == NULL)
		return -ENOMEM;
	for (i = 0; i < brd->nasync; i++)
		tty_port_init(&brd->serial_ports[i]);

	brd->printer_ports = kcalloc(brd->nasync, sizeof(*brd->printer_ports),
					GFP_KERNEL);
	if (brd->printer_ports == NULL)
		return -ENOMEM;

	for (i = 0; i < brd->nasync; i++)
	for (i = 0; i < brd->nasync; i++) {
		tty_port_init(&brd->serial_ports[i]);
		tty_port_init(&brd->printer_ports[i]);
	}

	ch = brd->channels[0];
	for (i = 0; i < brd->nasync; i++, ch = brd->channels[i]) {