diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2017-06-28 18:28:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-29 15:18:36 -0400 |
| commit | cb108619f2fc77846bf7a7543517f3487f455b24 (patch) | |
| tree | 97efed19db0fb87fcdba34fd04f32afdb32b1878 /drivers/net/arcnet | |
| parent | 0d494fcf867f95040b5b67e4bc5af739bcda37da (diff) | |
| download | blackbird-obmc-linux-cb108619f2fc77846bf7a7543517f3487f455b24.tar.gz blackbird-obmc-linux-cb108619f2fc77846bf7a7543517f3487f455b24.zip | |
arcnet: com20020-pci: fix dev_id calculation
The dev_id was miscalculated. Only the two bits 4-5 are relevant for the
MA1 card. PCIARC1 and PCIFB2 use the four bits 4-7 for id selection.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/arcnet')
| -rw-r--r-- | drivers/net/arcnet/com20020-pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index 239de38fbd6a..fec2df2c869f 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) { @@ -179,8 +180,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); |
