From 62c210dd9dc3597f70ddf2002ccd433e6e514b75 Mon Sep 17 00:00:00 2001 From: "remi.denis-courmont@nokia" Date: Fri, 23 Jan 2009 03:00:29 +0000 Subject: [PATCH] --- yaml --- r: 133912 b: refs/heads/master c: 6530e0fee1834fab51720769ac422186de2b3120 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/phonet/pn_dev.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7d1ba7bd5d1b..8db905235398 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 660f706d931d4795d341805e083a8091af74fa88 +refs/heads/master: 6530e0fee1834fab51720769ac422186de2b3120 diff --git a/trunk/net/phonet/pn_dev.c b/trunk/net/phonet/pn_dev.c index fd418107652b..3e24c0522ee3 100644 --- a/trunk/net/phonet/pn_dev.c +++ b/trunk/net/phonet/pn_dev.c @@ -204,13 +204,8 @@ void phonet_device_exit(void) struct phonet_device *pnd, *n; rtnl_unregister_all(PF_PHONET); - rtnl_lock(); - spin_lock_bh(&pndevs.lock); + unregister_netdevice_notifier(&phonet_device_notifier); list_for_each_entry_safe(pnd, n, &pndevs.list, list) __phonet_device_free(pnd); - - spin_unlock_bh(&pndevs.lock); - rtnl_unlock(); - unregister_netdevice_notifier(&phonet_device_notifier); }