| Message ID | 49F0B920.1050704@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Apr 23, 2009 at 08:53:20PM +0200, Roel Kluin wrote: > Olof Johansson wrote: > > On Thu, Apr 23, 2009 at 07:44:09PM +0200, Roel Kluin wrote: > > This can in practice never happen which is likely why it went > > unnoticed. > > > define a new variable with an appropriate name, please. > > Ok, how's this? Good, but you might have to repost without the email trail above the patch description. Normally putting it under the signed-off-by line with three dashes between will make sure it doesn't get picked up by the git tools. Anyway, that's all up to Dave, if you end up reposting feel free to add: > --------------------------->8-------------8<------------------------------ > 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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Olof Johansson <olof@lixom.net> Date: Thu, 23 Apr 2009 14:54:03 -0500 > Anyway, that's all up to Dave, if you end up reposting feel free to add: ... > Acked-by: Olof Johansson <olof@lixom.net> Patch applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 5eeb5a8..1e8f396 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c @@ -1740,7 +1740,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) @@ -1798,12 +1798,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: