This patch fixes some pr_warns that have newline chars in the string because they mess up the output. Signed-off-by: Mark Hounschell <markh@xxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/staging/dgap/dgap.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 869a9f6..07f7636 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); -- 1.8.1.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel