[SCSI] bsg: replace kobject_get with blk_get_queue

Both takes a ref to a queue. But blk_get_queue checks QUEUE_FLAG_DEAD
and is more appropriate interface here.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/block/bsg.c b/block/bsg.c
index d8e0cb8dd6be..e2c65a150a79 100644
--- a/block/bsg.c
+++ b/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);