From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 15 Jan 2008 23:18:12 +0000 (+0200)
Subject: CONNECTOR: don't touch queue dev after decrement of ref count
X-Git-Tag: v2.6.16.59-rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fdf12742cdc18ca30ff6c3bec3bf1748deffa7;p=thirdparty%2Fkernel%2Fstable.git

CONNECTOR: don't touch queue dev after decrement of ref count

cn_queue_free_callback() will touch 'dev'(i.e. cbq->pdev),
so it should be called before atomic_dec(&dev->refcnt).

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---

diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 9f2f00d82917a..e9de8a79acaa3 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -98,8 +98,8 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id
 	spin_unlock_bh(&dev->queue_lock);
 
 	if (found) {
-		atomic_dec(&dev->refcnt);
 		cn_queue_free_callback(cbq);
+		atomic_dec(&dev->refcnt);
 		return -EINVAL;
 	}