From 640fb55967f0be2a997f1e7db14161c6d7551419 Mon Sep 17 00:00:00 2001 From: Greg KH Date: Fri, 8 Jul 2011 03:45:25 +0000 Subject: [PATCH] --- yaml --- r: 254881 b: refs/heads/master c: 5e2cd0825a43824827b233d95bc47c0c970e5bef h: refs/heads/master i: 254879: b7528904ef7dc0a638e34588131d8bb3b6562961 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/hso.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d1263cac9f74..5e3c219a6f86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1f524e36cb691d20bfdaee423977f1decb81cf6 +refs/heads/master: 5e2cd0825a43824827b233d95bc47c0c970e5bef diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c index 387ca43f26f4..304fe78ff60e 100644 --- a/trunk/drivers/net/usb/hso.c +++ b/trunk/drivers/net/usb/hso.c @@ -2421,10 +2421,8 @@ static void hso_free_net_device(struct hso_device *hso_dev) remove_net_device(hso_net->parent); - if (hso_net->net) { + if (hso_net->net) unregister_netdev(hso_net->net); - free_netdev(hso_net->net); - } /* start freeing */ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) { @@ -2436,6 +2434,9 @@ static void hso_free_net_device(struct hso_device *hso_dev) kfree(hso_net->mux_bulk_tx_buf); hso_net->mux_bulk_tx_buf = NULL; + if (hso_net->net) + free_netdev(hso_net->net); + kfree(hso_dev); }