From 43c47433b8ea0b7250ea2dd26506416957452b93 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Sat, 25 Sep 2010 23:58:00 +0000 Subject: [PATCH] --- yaml --- r: 211117 b: refs/heads/master c: 52933f052186877afd218aef7a1b2dbdb010939f h: refs/heads/master i: 211115: d6914cfe3e6a0ce168ec505b06728f11cd1a7445 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 166c377bc1ef..2458765ec6f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62038e4a146b97352d5911e6ede36c58d4187c3e +refs/heads/master: 52933f052186877afd218aef7a1b2dbdb010939f diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index 3506fd6ad726..519e19e23955 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/drivers/net/ibm_newemac/core.c @@ -2928,7 +2928,7 @@ static int __devinit emac_probe(struct platform_device *ofdev, if (dev->emac_irq != NO_IRQ) irq_dispose_mapping(dev->emac_irq); err_free: - kfree(ndev); + free_netdev(ndev); err_gone: /* if we were on the bootlist, remove us as we won't show up and * wake up all waiters to notify them in case they were waiting @@ -2971,7 +2971,7 @@ static int __devexit emac_remove(struct platform_device *ofdev) if (dev->emac_irq != NO_IRQ) irq_dispose_mapping(dev->emac_irq); - kfree(dev->ndev); + free_netdev(dev->ndev); return 0; }