Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90469
b: refs/heads/master
c: 652f093
h: refs/heads/master
i:
  90467: eb0f865
v: v3
  • Loading branch information
Denis V. Lunev authored and Jeff Garzik committed Mar 29, 2008
1 parent 2f32989 commit edac35b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80950f8b71176ae8b6f2a78de039b8bc2da7f480
refs/heads/master: 652f093fdf14c7ca1e13c052da429ae385e4dc21
6 changes: 3 additions & 3 deletions trunk/drivers/net/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)
/* Always use CB2 mode, difference is masked
* in the CB driver. */
IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 2);
if (dca_add_requester(dev) == IXGBE_SUCCESS) {
if (dca_add_requester(dev) == 0) {
ixgbe_setup_dca(adapter);
break;
}
Expand All @@ -381,7 +381,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)
break;
}

return IXGBE_SUCCESS;
return 0;
}

#endif /* CONFIG_DCA */
Expand Down Expand Up @@ -3605,7 +3605,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
goto err_register;

#ifdef CONFIG_DCA
if (dca_add_requester(&pdev->dev) == IXGBE_SUCCESS) {
if (dca_add_requester(&pdev->dev) == 0) {
adapter->flags |= IXGBE_FLAG_DCA_ENABLED;
/* always use CB2 mode, difference is masked
* in the CB driver */
Expand Down

0 comments on commit edac35b

Please sign in to comment.