From a7fd65a1df592d7d4301311d4d990943b2679844 Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Thu, 25 Nov 2010 07:53:55 +0000 Subject: [PATCH] --- yaml --- r: 224525 b: refs/heads/master c: c661c4a2b0d64c33afc9018a406162b1f8ac5617 h: refs/heads/master i: 224523: a2a47e5462a1f2c2bb4d198d29f30b521f332930 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/cxgb3_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 104a972ec256..c36e2b8dd4d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82a39eb6b3829a02e235656feddb4542517fcabc +refs/heads/master: c661c4a2b0d64c33afc9018a406162b1f8ac5617 diff --git a/trunk/drivers/net/cxgb3/cxgb3_main.c b/trunk/drivers/net/cxgb3/cxgb3_main.c index 046d846c652d..386461750d0f 100644 --- a/trunk/drivers/net/cxgb3/cxgb3_main.c +++ b/trunk/drivers/net/cxgb3/cxgb3_main.c @@ -3006,12 +3006,11 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) { struct adapter *adapter = pci_get_drvdata(pdev); - int ret; if (state == pci_channel_io_perm_failure) return PCI_ERS_RESULT_DISCONNECT; - ret = t3_adapter_error(adapter, 0, 0); + t3_adapter_error(adapter, 0, 0); /* Request a slot reset. */ return PCI_ERS_RESULT_NEED_RESET;