From: Mark Hounschell Date: Mon, 3 Mar 2014 21:36:25 +0000 (-0500) Subject: staging: dgap: fix some pr_warns with new lines in the string X-Git-Tag: firefly_0821_release~176^2~4193^2~695 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=249e7343c4060a224e40cf7608322533187194b4;p=firefly-linux-kernel-4.4.55.git staging: dgap: fix some pr_warns with new lines in the string This patch fixes some pr_warns that have newline chars in the string because they mess up the output. Signed-off-by: Mark Hounschell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 12d17cad3b9a..5dfce34794f1 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -1406,13 +1406,17 @@ static int dgap_tty_init(struct board_t *brd) brd->nasync = brd->maxports; if (true_count != brd->nasync) { - if ((brd->type == PPCM) && (true_count == 64)) - pr_warn("dgap: %s configured for %d ports, has %d ports.\nPlease make SURE the EBI cable running from the card\nto each EM module is plugged into EBI IN!\n", + if ((brd->type == PPCM) && (true_count == 64)) { + pr_warn("dgap: %s configured for %d ports, has %d ports.\n", brd->name, brd->nasync, true_count); - else if ((brd->type == PPCM) && (true_count == 0)) - pr_warn("dgap: %s configured for %d ports, has %d ports.\nPlease make SURE the EBI cable running from the card\nto each EM module is plugged into EBI IN!\n", + pr_warn("dgap: Please make SURE the EBI cable running from the card\n"); + pr_warn("dgap: to each EM module is plugged into EBI IN!\n"); + } else if ((brd->type == PPCM) && (true_count == 0)) { + pr_warn("dgap: %s configured for %d ports, has %d ports.\n", brd->name, brd->nasync, true_count); - else + pr_warn("dgap: Please make SURE the EBI cable running from the card\n"); + pr_warn("dgap: to each EM module is plugged into EBI IN!\n"); + } else pr_warn("dgap: %s configured for %d ports, has %d ports.\n", brd->name, brd->nasync, true_count);