diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /drivers/net/fs_enet/fs_enet-main.c | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'drivers/net/fs_enet/fs_enet-main.c')
| -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; |