From 170de0f11ee36dcabfb131713b9fb208b9aefaf8 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Thu, 8 Jul 2010 23:42:40 -0700 Subject: [PATCH] --- yaml --- r: 203430 b: refs/heads/master c: 9f1e7582749980b51da67671b2536aadca3596b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ax88796.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6203c8311e64..812fd682a479 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3038bdb122c8aa2b219b548a345aafb1204c4f0b +refs/heads/master: 9f1e7582749980b51da67671b2536aadca3596b8 diff --git a/trunk/drivers/net/ax88796.c b/trunk/drivers/net/ax88796.c index 55c9958043c4..20e946b1e744 100644 --- a/trunk/drivers/net/ax88796.c +++ b/trunk/drivers/net/ax88796.c @@ -481,8 +481,10 @@ static int ax_open(struct net_device *dev) return ret; ret = ax_ei_open(dev); - if (ret) + if (ret) { + free_irq(dev->irq, dev); return ret; + } /* turn the phy on (if turned off) */