From a66369a59016e6f5c5da77afbd53eec49b03fb68 Mon Sep 17 00:00:00 2001 From: Daeseok Youn Date: Mon, 26 May 2014 19:24:47 +0900 Subject: [PATCH] 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: Daeseok Youn Signed-off-by: Greg Kroah-Hartman --- drivers/staging/dgap/dgap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 06abb2047443..65d651ed7117 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -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]) { -- 2.11.0