diff --git a/[refs] b/[refs] index 5e0b2dbfe70d..7e7fd2c818d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b5923cd477674755dde670ba804649523f27c97 +refs/heads/master: 4ecc8c066f3cecb55807644a01435084d8ed638a diff --git a/trunk/drivers/net/fs_enet/fs_enet-main.c b/trunk/drivers/net/fs_enet/fs_enet-main.c index 67b4b0728fce..a5baaf59ff66 100644 --- a/trunk/drivers/net/fs_enet/fs_enet-main.c +++ b/trunk/drivers/net/fs_enet/fs_enet-main.c @@ -1093,7 +1093,7 @@ static struct net_device *fs_init_instance(struct device *dev, if (registered) unregister_netdev(ndev); - if (fep != NULL) { + if (fep && fep->ops) { (*fep->ops->free_bd)(ndev); (*fep->ops->cleanup_data)(ndev); }