Merge branch 'arcnet-fixes'

Michael Grzeschik says:

====================
arcnet: Collection of latest fixes

Here we sum up the recent fixes I collected on the way to use and
stabilise the framework. Part of it is an possible deadlock that we
prevent as well to fix the calculation of the dev_id that can be setup
by an rotary encoder. Beside that we added an trivial spelling patch and
fix some wrong and missing assignments that improves the code footprint.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 9 insertions, 8 deletions

diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 62ee439d5882..53a1cb551def 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -756,6 +756,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
         struct net_device *dev = dev_id;
         struct arcnet_local *lp;
         int recbuf, status, diagstatus, didsomething, boguscount;
+        unsigned long flags;
         int retval = IRQ_NONE;
 
         arc_printk(D_DURING, dev, "\n");
@@ -765,7 +766,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
         lp = netdev_priv(dev);
         BUG_ON(!lp);
 
-        spin_lock(&lp->lock);
+        spin_lock_irqsave(&lp->lock, flags);
 
         /* RESET flag was enabled - if device is not running, we must
          * clear it right away (but nothing else).
@@ -774,7 +775,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
                 if (lp->hw.status(dev) & RESETflag)
                         lp->hw.command(dev, CFLAGScmd | RESETclear);
                 lp->hw.intmask(dev, 0);
-                spin_unlock(&lp->lock);
+                spin_unlock_irqrestore(&lp->lock, flags);
                 return retval;
         }
 
@@ -998,7 +999,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
         udelay(1);
         lp->hw.intmask(dev, lp->intmask);
 
-        spin_unlock(&lp->lock);
+        spin_unlock_irqrestore(&lp->lock, flags);
         return retval;
 }
 EXPORT_SYMBOL(arcnet_interrupt);
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 2056878fb087..4fa2e46b48d3 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -212,7 +212,7 @@ static int ack_tx(struct net_device *dev, int acked)
         ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */
         ackpkt->soft.cap.mes.ack = acked;
 
-        arc_printk(D_PROTO, dev, "Ackknowledge for cap packet %x.\n",
+        arc_printk(D_PROTO, dev, "Acknowledge for cap packet %x.\n",
                    *((int *)&ackpkt->soft.cap.cookie[0]));
 
         ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 239de38fbd6a..47f80b83dcf4 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -135,6 +135,7 @@ static int com20020pci_probe(struct pci_dev *pdev,
         for (i = 0; i < ci->devcount; i++) {
                 struct com20020_pci_channel_map *cm = &ci->chan_map_tbl[i];
                 struct com20020_dev *card;
+                int dev_id_mask = 0xf;
 
                 dev = alloc_arcdev(device);
                 if (!dev) {
@@ -166,6 +167,7 @@ static int com20020pci_probe(struct pci_dev *pdev,
                 arcnet_outb(0x00, ioaddr, COM20020_REG_W_COMMAND);
                 arcnet_inb(ioaddr, COM20020_REG_R_DIAGSTAT);
 
+                SET_NETDEV_DEV(dev, &pdev->dev);
                 dev->base_addr = ioaddr;
                 dev->dev_addr[0] = node;
                 dev->irq = pdev->irq;
@@ -179,8 +181,8 @@ static int com20020pci_probe(struct pci_dev *pdev,
 
                 /* Get the dev_id from the PLX rotary coder */
                 if (!strncmp(ci->name, "EAE PLX-PCI MA1", 15))
-                        dev->dev_id = 0xc;
-                dev->dev_id ^= inb(priv->misc + ci->rotary) >> 4;
+                        dev_id_mask = 0x3;
+                dev->dev_id = (inb(priv->misc + ci->rotary) >> 4) & dev_id_mask;
 
                 snprintf(dev->name, sizeof(dev->name), "arc%d-%d", dev->dev_id, i);
 
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index 13d9ad4b3f5c..78043a9c5981 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -246,8 +246,6 @@ int com20020_found(struct net_device *dev, int shared)
                 return -ENODEV;
         }
 
-        dev->base_addr = ioaddr;
-
         arc_printk(D_NORMAL, dev, "%s: station %02Xh found at %03lXh, IRQ %d.\n",
                    lp->card_name, dev->dev_addr[0], dev->base_addr, dev->irq);