Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3af373...
Commit:     3af373021fa32f8f787bfbdcc1a9277a287bde4e
Parent:     a01777ecf227de735d7e525ecda48fe74b838a17
Author:     Stefano Panella <stefano.panella@csr.com>
AuthorDate: Tue Dec 23 12:31:09 2008 +0000
Committer:  David Vrabel <david.vrabel@csr.com>
CommitDate: Tue Dec 23 12:31:09 2008 +0000

    uwb: remove beacon cache entry after calling uwb_notify()
    
    Removing the beacon cache entry from a uwb_dev can cause an oops if the
    bce is released before the call to uwb_notify().
    
    Signed-off-by: Stefano Panella <stefano.panella@csr.com>
    Signed-off-by: David Vrabel <david.vrabel@csr.com>
---
 drivers/uwb/beacon.c |    2 --
 drivers/uwb/lc-dev.c |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index 0315093..36bc315 100644
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -289,8 +289,6 @@ void uwb_beca_purge(struct uwb_rc *rc)
 		expires = bce->ts_jiffies + msecs_to_jiffies(beacon_timeout_ms);
 		if (time_after(jiffies, expires)) {
 			uwbd_dev_offair(bce);
-			list_del(&bce->node);
-			uwb_bce_put(bce);
 		}
 	}
 	mutex_unlock(&rc->uwb_beca.mutex);
diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c
index f78087b..e9fe1bb 100644
--- a/drivers/uwb/lc-dev.c
+++ b/drivers/uwb/lc-dev.c
@@ -375,6 +375,8 @@ int __uwb_dev_offair(struct uwb_dev *uwb_dev, struct uwb_rc *rc)
 		 rc ? rc->uwb_dev.dev.parent->bus->name : "n/a",
 		 rc ? dev_name(rc->uwb_dev.dev.parent) : "");
 	uwb_dev_rm(uwb_dev);
+	list_del(&uwb_dev->bce->node);
+	uwb_bce_put(uwb_dev->bce);
 	uwb_dev_put(uwb_dev);	/* for the creation in _onair() */
 
 	return 0;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html