2007-11-16 19:22:21

by Divy Le ray

Subject: [PATCH 1/9] cxgb3 - fix MSI-X failure path

From: Divy Le Ray <[email protected]>

Return error code when msi-x settings fail.

Signed-off-by: Divy Le Ray <[email protected]>
---

drivers/net/cxgb3/cxgb3_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 61ffc92..bb0d1c8 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -839,7 +839,8 @@ static int cxgb_up(struct adapter *adap)
if (err)
goto irq_err;

- if (request_msix_data_irqs(adap)) {
+ err = request_msix_data_irqs(adap);
+ if (err) {
free_irq(adap->msix_info[0].vec, adap);
goto irq_err;
}

2007-11-24 03:00:26

by Jeff Garzik

Subject: Re: [PATCH 1/9] cxgb3 - fix MSI-X failure path

Divy Le Ray wrote:
> From: Divy Le Ray <[email protected]>
>
> Return error code when msi-x settings fail.
>
> Signed-off-by: Divy Le Ray <[email protected]>
> ---
>
> drivers/net/cxgb3/cxgb3_main.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)

applied 1-9 to #upstream, then trimmed all trailing whitespace