diff --git a/[refs] b/[refs] index 234ad1a3191e..9a54b2858926 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cba0516ddb9153afdc0ffffb9124f5f12a3b6ae5 +refs/heads/master: 42256f57d894a4e4aa5af42d04191d7a12f10df9 diff --git a/trunk/drivers/net/cxgb3/cxgb3_main.c b/trunk/drivers/net/cxgb3/cxgb3_main.c index 61ffc925eae7..bb0d1c841c0f 100644 --- a/trunk/drivers/net/cxgb3/cxgb3_main.c +++ b/trunk/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; }