Commit fe3a83af authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by David S. Miller

declance: Fix continuation with the adapter identification message

Fix a commit 4bcc595c ("printk: reinstate KERN_CONT for printing
continuation lines") regression with the `declance' driver, which caused
the adapter identification message to be split between two lines, e.g.:

declance.c: v0.011 by Linux MIPS DECstation task force
tc6: PMAD-AA
, addr = 08:00:2b:1b:2a:6a, irq = 14
tc6: registered as eth0.

Address that properly, by printing identification with a single call,
making the messages now look like:

declance.c: v0.011 by Linux MIPS DECstation task force
tc6: PMAD-AA, addr = 08:00:2b:1b:2a:6a, irq = 14
tc6: registered as eth0.
Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Fixes: 4bcc595c ("printk: reinstate KERN_CONT for printing continuation lines")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 657ade07
...@@ -1031,6 +1031,7 @@ static int dec_lance_probe(struct device *bdev, const int type) ...@@ -1031,6 +1031,7 @@ static int dec_lance_probe(struct device *bdev, const int type)
int i, ret; int i, ret;
unsigned long esar_base; unsigned long esar_base;
unsigned char *esar; unsigned char *esar;
const char *desc;
if (dec_lance_debug && version_printed++ == 0) if (dec_lance_debug && version_printed++ == 0)
printk(version); printk(version);
...@@ -1216,19 +1217,20 @@ static int dec_lance_probe(struct device *bdev, const int type) ...@@ -1216,19 +1217,20 @@ static int dec_lance_probe(struct device *bdev, const int type)
*/ */
switch (type) { switch (type) {
case ASIC_LANCE: case ASIC_LANCE:
printk("%s: IOASIC onboard LANCE", name); desc = "IOASIC onboard LANCE";
break; break;
case PMAD_LANCE: case PMAD_LANCE:
printk("%s: PMAD-AA", name); desc = "PMAD-AA";
break; break;
case PMAX_LANCE: case PMAX_LANCE:
printk("%s: PMAX onboard LANCE", name); desc = "PMAX onboard LANCE";
break; break;
} }
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = esar[i * 4]; dev->dev_addr[i] = esar[i * 4];
printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq); printk("%s: %s, addr = %pM, irq = %d\n",
name, desc, dev->dev_addr, dev->irq);
dev->netdev_ops = &lance_netdev_ops; dev->netdev_ops = &lance_netdev_ops;
dev->watchdog_timeo = 5*HZ; dev->watchdog_timeo = 5*HZ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment