Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136098
b: refs/heads/master
c: 68f40c1
h: refs/heads/master
v: v3
  • Loading branch information
Divy Le Ray authored and David S. Miller committed Mar 27, 2009
1 parent 0d986d6 commit 57c6caf
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 3fa58c883d44c50b48f2d57a0bc626a7812b0cae
refs/heads/master: 68f40c10292a94762956896d4d320a2620945adc
5 changes: 4 additions & 1 deletion trunk/drivers/net/cxgb3/cxgb3_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2871,6 +2871,9 @@ static void t3_io_resume(struct pci_dev *pdev)
{
struct adapter *adapter = pci_get_drvdata(pdev);

CH_ALERT(adapter, "adapter recovering, PEX ERR 0x%x\n",
t3_read_reg(adapter, A_PCIE_PEX_ERR));

t3_resume_ports(adapter);
}

Expand Down Expand Up @@ -3003,7 +3006,7 @@ static int __devinit init_one(struct pci_dev *pdev,
static int version_printed;

int i, err, pci_using_dac = 0;
unsigned long mmio_start, mmio_len;
resource_size_t mmio_start, mmio_len;
const struct adapter_info *ai;
struct adapter *adapter = NULL;
struct port_info *pi;
Expand Down

0 comments on commit 57c6caf

Please sign in to comment.