Commit bfeaa681 authored by René Rebe's avatar René Rebe Committed by Dominik Brodowski
Browse files

PCMCIA: Fix garbled log messages for KERN_CONT 



For years the PCMCIA info messages are messed up by superfluous
newlines. While f2e6cf76 ("pcmcia: Convert dev_printk to
dev_<level>") converted the code to pr_cont(), dev_info enforces a \n
via vprintk_store setting LOG_NEWLINE, breaking subsequent pr_cont.

Fix by logging the device name manually to allow pr_cont to work for
more readable and not \n distorted logs.

Fixes: f2e6cf76 ("pcmcia: Convert dev_printk to dev_<level>")
Signed-off-by: default avatarRené Rebe <rene@exactco.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 7aaa8047

drivers/pcmcia/rsrc_nonstatic.c

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base, 
	int any;

	u_char *b, hole, most;



	dev_info(&s->dev, "cs: IO port probe %#x-%#x:", base, base+num-1);

	pr_info("%s: cs: IO port probe %#x-%#x:", dev_name(&s->dev), base, base+num-1);



	/* First, what does a floating port look like? */

	b = kzalloc(256, GFP_KERNEL);
@@ -409,8 +409,8 @@ static int do_mem_probe(struct pcmcia_socket *s, u_long base, u_long num, 
	struct socket_data *s_data = s->resource_data;

	u_long i, j, bad, fail, step;



	dev_info(&s->dev, "cs: memory probe 0x%06lx-0x%06lx:",

		 base, base+num-1);

	pr_info("%s: cs: memory probe 0x%06lx-0x%06lx:",

	       dev_name(&s->dev), base, base+num-1);

	bad = fail = 0;

	step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff);

	/* don't allow too large steps */