From 627b0a00c5e8fc64562d43209996be069286da50 Mon Sep 17 00:00:00 2001 From: Wang Chen Date: Thu, 18 Dec 2008 19:36:46 -0800 Subject: [PATCH] --- yaml --- r: 122775 b: refs/heads/master c: b88a2a22c6670c31586d1a716255eae4c320b363 h: refs/heads/master i: 122773: db526dd21429ad7dea7a1499b60bc7c0e2f38d4d 122771: 8c8d6736230b94c90f7d9b09515288e42f5c42cb 122767: 6c10917b3c5b62f8be867b93db3e512e87d7ed82 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/zd1201.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1040fc676358..7d4b9362187d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3de77cf23e9a19b9fc28e3b29371308325428c39 +refs/heads/master: b88a2a22c6670c31586d1a716255eae4c320b363 diff --git a/trunk/drivers/net/wireless/zd1201.c b/trunk/drivers/net/wireless/zd1201.c index 3404807b3e12..b45c27d42fd8 100644 --- a/trunk/drivers/net/wireless/zd1201.c +++ b/trunk/drivers/net/wireless/zd1201.c @@ -1841,10 +1841,6 @@ static void zd1201_disconnect(struct usb_interface *interface) if (!zd) return; usb_set_intfdata(interface, NULL); - if (zd->dev) { - unregister_netdev(zd->dev); - free_netdev(zd->dev); - } hlist_for_each_entry_safe(frag, node, node2, &zd->fraglist, fnode) { hlist_del_init(&frag->fnode); @@ -1860,7 +1856,11 @@ static void zd1201_disconnect(struct usb_interface *interface) usb_kill_urb(zd->rx_urb); usb_free_urb(zd->rx_urb); } - kfree(zd); + + if (zd->dev) { + unregister_netdev(zd->dev); + free_netdev(zd->dev); + } } #ifdef CONFIG_PM