Skip to content

Commit bfeaa68

Browse files
rxrblnDominik Brodowski
authored andcommitted
PCMCIA: Fix garbled log messages for KERN_CONT
For years the PCMCIA info messages are messed up by superfluous newlines. While f2e6cf7 ("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: f2e6cf7 ("pcmcia: Convert dev_printk to dev_<level>") Signed-off-by: René Rebe <rene@exactco.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
1 parent 7aaa804 commit bfeaa68

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/pcmcia/rsrc_nonstatic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
187187
int any;
188188
u_char *b, hole, most;
189189

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

192192
/* First, what does a floating port look like? */
193193
b = kzalloc(256, GFP_KERNEL);
@@ -409,8 +409,8 @@ static int do_mem_probe(struct pcmcia_socket *s, u_long base, u_long num,
409409
struct socket_data *s_data = s->resource_data;
410410
u_long i, j, bad, fail, step;
411411

412-
dev_info(&s->dev, "cs: memory probe 0x%06lx-0x%06lx:",
413-
base, base+num-1);
412+
pr_info("%s: cs: memory probe 0x%06lx-0x%06lx:",
413+
dev_name(&s->dev), base, base+num-1);
414414
bad = fail = 0;
415415
step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff);
416416
/* don't allow too large steps */

0 commit comments

Comments
 (0)