From 0ffa98c06abf603b42a7b8a15dea1c9c20c2b831 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Tue, 28 Sep 2010 21:08:01 +0400 Subject: [PATCH] --- yaml --- r: 220003 b: refs/heads/master c: c4711c3acb9fbe7f559ead7ff511dba3665a048e h: refs/heads/master i: 220001: a52cb7ba76ba90d203135489b56febdf20d43157 219999: 79be604815d654a172888ec76b414f4d885d56b9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/octeon/ethernet.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d584fcddbda5..575ec0366772 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8db3271cb24d4298e39a249c4dd966b189b05e97 +refs/heads/master: c4711c3acb9fbe7f559ead7ff511dba3665a048e diff --git a/trunk/drivers/staging/octeon/ethernet.c b/trunk/drivers/staging/octeon/ethernet.c index fb568a935eef..a8f780e95e0a 100644 --- a/trunk/drivers/staging/octeon/ethernet.c +++ b/trunk/drivers/staging/octeon/ethernet.c @@ -670,7 +670,7 @@ static int __init cvm_oct_init_module(void) if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device for POW\n"); - kfree(dev); + free_netdev(dev); } else { cvm_oct_device[CVMX_PIP_NUM_INPUT_PORTS] = dev; pr_info("%s: POW send group %d, receive group %d\n", @@ -756,12 +756,12 @@ static int __init cvm_oct_init_module(void) } if (!dev->netdev_ops) { - kfree(dev); + free_netdev(dev); } else if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device " "for interface %d, port %d\n", interface, priv->port); - kfree(dev); + free_netdev(dev); } else { cvm_oct_device[priv->port] = dev; fau -= @@ -815,7 +815,7 @@ static void __exit cvm_oct_cleanup_module(void) cvm_oct_tx_shutdown_dev(dev); unregister_netdev(dev); - kfree(dev); + free_netdev(dev); cvm_oct_device[port] = NULL; } }