diff options
| author | FUJITA Tomonori <tomof@acm.org> | 2007-07-21 13:23:25 +0900 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-21 08:58:41 -0500 |
| commit | df468820b6881fc14e50f6b2fcffd3e945417d68 (patch) | |
| tree | d1c0adca77b728dae3f4653de0388202d4f5ee5a /block/bsg.c | |
| parent | 39dca558a5b52b63e49bc234a7e887be092aa690 (diff) | |
| download | op-kernel-dev-df468820b6881fc14e50f6b2fcffd3e945417d68.zip op-kernel-dev-df468820b6881fc14e50f6b2fcffd3e945417d68.tar.gz | |
[SCSI] bsg: fix bsg_unregister_queue
scsi_sysfs_add_sdev ignores the bsg_register_queue failure, so
bsg_unregister_queue must check whether the queue has a bsg device.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'block/bsg.c')
| -rw-r--r-- | block/bsg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/bsg.c b/block/bsg.c index 4eebcd5..1ba9bc6 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -932,7 +932,8 @@ void bsg_unregister_queue(struct request_queue *q) { struct bsg_class_device *bcd = &q->bsg_dev; - WARN_ON(!bcd->class_dev); + if (!bcd->class_dev) + return; mutex_lock(&bsg_mutex); sysfs_remove_link(&q->kobj, "bsg"); |
