diff options
author | 2008-05-23 00:05:14 -0700 | |
---|---|---|
committer | 2008-05-23 00:05:14 -0700 | |
commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/fs_enet/fs_enet-main.c | |
parent | netlink: Fix nla_parse_nested_compat() to call nla_parse() directly (diff) | |
parent | fmvj18x_cs: add NextCom NC5310 rev B support (diff) | |
download | linux-dev-7bece8155be133cd67c41eed2b31c60a310609de.tar.xz linux-dev-7bece8155be133cd67c41eed2b31c60a310609de.zip |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/fs_enet/fs_enet-main.c')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 67b4b0728fce..a5baaf59ff66 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c @@ -1093,7 +1093,7 @@ err: if (registered) unregister_netdev(ndev); - if (fep != NULL) { + if (fep && fep->ops) { (*fep->ops->free_bd)(ndev); (*fep->ops->cleanup_data)(ndev); } |