From d1fd28c8abb673a15a10ace1fd9e2c125f24e5f5 Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Thu, 25 Feb 2010 15:31:50 -0300 Subject: [PATCH] --- yaml --- r: 185209 b: refs/heads/master c: 137ee2f5d173a0e859e35bfb900261418eb88ace h: refs/heads/master i: 185207: 9dc1a90ab772b7a21bb06a43fe06d4f0d3a4db36 v: v3 --- [refs] | 2 +- trunk/drivers/serial/jsm/jsm_tty.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 645a54820988..ec424ec0db17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54862ee005943d0fdb13d4e54220f234676e05f5 +refs/heads/master: 137ee2f5d173a0e859e35bfb900261418eb88ace diff --git a/trunk/drivers/serial/jsm/jsm_tty.c b/trunk/drivers/serial/jsm/jsm_tty.c index cd95e215550d..5673ca9dfdc8 100644 --- a/trunk/drivers/serial/jsm/jsm_tty.c +++ b/trunk/drivers/serial/jsm/jsm_tty.c @@ -432,7 +432,7 @@ int __devinit jsm_tty_init(struct jsm_board *brd) int jsm_uart_port_init(struct jsm_board *brd) { - int i; + int i, rc; unsigned int line; struct jsm_channel *ch; @@ -467,8 +467,11 @@ int jsm_uart_port_init(struct jsm_board *brd) } else set_bit(line, linemap); brd->channels[i]->uart_port.line = line; - if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port)) - printk(KERN_INFO "jsm: add device failed\n"); + rc = uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port); + if (rc){ + printk(KERN_INFO "jsm: Port %d failed. Aborting...\n", i); + return rc; + } else printk(KERN_INFO "jsm: Port %d added\n", i); }