diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/net/fs_enet | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/net/fs_enet')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 4e6a9195fe5f..ce900e54d8d1 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
| @@ -795,6 +795,7 @@ static int fs_enet_open(struct net_device *dev) | |||
| 795 | 795 | ||
| 796 | err = fs_init_phy(dev); | 796 | err = fs_init_phy(dev); |
| 797 | if (err) { | 797 | if (err) { |
| 798 | free_irq(fep->interrupt, dev); | ||
| 798 | if (fep->fpi->use_napi) | 799 | if (fep->fpi->use_napi) |
| 799 | napi_disable(&fep->napi); | 800 | napi_disable(&fep->napi); |
| 800 | return err; | 801 | return err; |