Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332903
b: refs/heads/master
c: 2dfc967
h: refs/heads/master
i:
  332901: 7e1d895
  332899: e56fbd0
  332895: ac25d00
v: v3
  • Loading branch information
Peter Senna Tschudin authored and David S. Miller committed Oct 7, 2012
1 parent 3a6c14d commit 3bfe646
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 14834540cafff24944affd6290f01359799a48ce
refs/heads/master: 2dfc96719187d3cb632922a9455abd008db467eb
3 changes: 2 additions & 1 deletion trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1601,7 +1601,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
adapter->netdev = netdev;
adapter->pdev = pdev;

if (qlcnic_alloc_adapter_resources(adapter))
err = qlcnic_alloc_adapter_resources(adapter);
if (err)
goto err_out_free_netdev;

adapter->dev_rst_time = jiffies;
Expand Down

0 comments on commit 3bfe646

Please sign in to comment.