Merge 4.19-rc7 into char-misc-next

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 116997a8b593..00332a1ea84b 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -1031,6 +1031,7 @@ static int dec_lance_probe(struct device *bdev, const int type)
         int i, ret;
         unsigned long esar_base;
         unsigned char *esar;
+        const char *desc;
 
         if (dec_lance_debug && version_printed++ == 0)
                 printk(version);
@@ -1216,19 +1217,20 @@ static int dec_lance_probe(struct device *bdev, const int type)
          */
         switch (type) {
         case ASIC_LANCE:
-                printk("%s: IOASIC onboard LANCE", name);
+                desc = "IOASIC onboard LANCE";
                 break;
         case PMAD_LANCE:
-                printk("%s: PMAD-AA", name);
+                desc = "PMAD-AA";
                 break;
         case PMAX_LANCE:
-                printk("%s: PMAX onboard LANCE", name);
+                desc = "PMAX onboard LANCE";
                 break;
         }
         for (i = 0; i < 6; i++)
                 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->watchdog_timeo = 5*HZ;