diff options
| author | roel kluin <roel.kluin@gmail.com> | 2009-04-23 08:53:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-27 03:20:17 -0700 |
| commit | 15b8e19131486856373592e45793a79aefb6fbe7 (patch) | |
| tree | e833a48bf5da7b2fdecb5894fd5dcfa7935b54a4 | |
| parent | 683703a26e4677db437a1480682851e27c7a154f (diff) | |
| download | op-kernel-dev-15b8e19131486856373592e45793a79aefb6fbe7.zip op-kernel-dev-15b8e19131486856373592e45793a79aefb6fbe7.tar.gz | |
pasemi_mac: mac_to_intf() error not noticed
mac_to_intf() can return -1 when no device or function is found, but when
mac->dma_if is unsigned. The error wasn't noticed.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/pasemi_mac.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 6ea4539..c254a7f 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c @@ -1733,7 +1733,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct net_device *dev; struct pasemi_mac *mac; - int err; + int err, ret; err = pci_enable_device(pdev); if (err) @@ -1791,12 +1791,13 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } memcpy(dev->dev_addr, mac->mac_addr, sizeof(mac->mac_addr)); - mac->dma_if = mac_to_intf(mac); - if (mac->dma_if < 0) { + ret = mac_to_intf(mac); + if (ret < 0) { dev_err(&mac->pdev->dev, "Can't map DMA interface\n"); err = -ENODEV; goto out; } + mac->dma_if = ret; switch (pdev->device) { case 0xa005: |
