From 300e2da5c8d390c7c8cc82cd5861a475835f66ad Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 31 Mar 2008 10:03:39 +0900
Subject: [PATCH] --- yaml --- r: 89776 b: refs/heads/master c:
 c3ff1b90d8924dd1c55c3b56a79bfc563ace4a42 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/block/bsg.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f188d3b2b5d5..8850cc81b78f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d45ac4fa8f277e1ec5acfb67ce5d6406555760cf
+refs/heads/master: c3ff1b90d8924dd1c55c3b56a79bfc563ace4a42
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
index d8e0cb8dd6be..e2c65a150a79 100644
--- a/trunk/block/bsg.c
+++ b/trunk/block/bsg.c
@@ -740,16 +740,21 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
 					 struct file *file)
 {
 	struct bsg_device *bd;
+	int ret;
 #ifdef BSG_DEBUG
 	unsigned char buf[32];
 #endif
+	ret = blk_get_queue(rq);
+	if (ret)
+		return ERR_PTR(-ENXIO);
 
 	bd = bsg_alloc_device();
-	if (!bd)
+	if (!bd) {
+		blk_put_queue(rq);
 		return ERR_PTR(-ENOMEM);
+	}
 
 	bd->queue = rq;
-	kobject_get(&rq->kobj);
 	bsg_set_block(bd, file);
 
 	atomic_set(&bd->ref_count, 1);