Re: e1000_intr in request_irq faults in 2.6.20-git

From: Auke Kok
Date: Fri Feb 16 2007 - 01:25:54 EST


Andrew Morton wrote:
On Thu, 15 Feb 2007 18:10:53 -0800 "Brandeburg, Jesse" <jesse.brandeburg@xxxxxxxxx> wrote:

@@ -1431,6 +1427,10 @@ e1000_open(struct net_device *netdev)
e1000_update_mng_vlan(adapter);
}

+ err = e1000_request_irq(adapter);
+ if (err)
+ goto err_req_irq;
+
/* If AMT is enabled, let the firmware know that the network
* interface is now open */
if (adapter->hw.mac_type == e1000_82573 &&
@@ -1439,10 +1439,11 @@ e1000_open(struct net_device *netdev)

return E1000_SUCCESS;

+err_req_irq:
+ e1000_down(adapter);
+ e1000_free_irq(adapter);
err_up:

We don't want that e1000_free_irq(adapter) in the error path.


indeed, thanks for spotting and telling me before I sent this to Jeff.

Cheers,

Auke
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/