Commit 13f26c34 authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/netdev-2.6/amd8111

into pobox.com:/garz/repo/net-drivers-2.6
parents 58a96a60 b2ab5990
...@@ -1381,6 +1381,8 @@ static int amd8111e_open(struct net_device * dev ) ...@@ -1381,6 +1381,8 @@ static int amd8111e_open(struct net_device * dev )
if(amd8111e_restart(dev)){ if(amd8111e_restart(dev)){
spin_unlock_irq(&lp->lock); spin_unlock_irq(&lp->lock);
if (dev->irq)
free_irq(dev->irq, dev);
return -ENOMEM; return -ENOMEM;
} }
/* Start ipg timer */ /* Start ipg timer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment