diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 10:03:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 10:03:03 +0200 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /drivers/s390/net | |
| parent | net: r6040: store BIOS default MAC in perm_add (diff) | |
| parent | ipv6: add a missing unregister_pernet_subsys call (diff) | |
| download | linux-e40051d134f7ee95c8c1f7a3471e84eafc9ab326.tar.xz linux-e40051d134f7ee95c8c1f7a3471e84eafc9ab326.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/ctcm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 6edf20b62de5..2c7d2d9be4d0 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c @@ -1154,7 +1154,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) dev_fsm, dev_fsm_len, GFP_KERNEL); if (priv->fsm == NULL) { CTCMY_DBF_DEV(SETUP, dev, "init_fsm error"); - kfree(dev); + free_netdev(dev); return NULL; } fsm_newstate(priv->fsm, DEV_STATE_STOPPED); @@ -1165,7 +1165,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) grp = ctcmpc_init_mpc_group(priv); if (grp == NULL) { MPC_DBF_DEV(SETUP, dev, "init_mpc_group error"); - kfree(dev); + free_netdev(dev); return NULL; } tasklet_init(&grp->mpc_tasklet2, |