diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-03-14 12:07:59 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-03-14 12:07:59 -0400 |
| commit | 00d1b23f6168bde0ef7f45549c7bff393374f498 (patch) | |
| tree | 583ccf22b04281823c87dd25b476e37299e86184 /block | |
| parent | 1a71c9ae0f844238de43681c41563a4203b7e933 (diff) | |
| parent | 12b4af6966843baf7bb3aedbae93e69ae19405b0 (diff) | |
Merge tag 'v3.0.24' into v3.0-rt-next
This is the 3.0.24 stable release
Diffstat (limited to 'block')
| -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 0c8b64a16484..792ead666757 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -985,7 +985,8 @@ void bsg_unregister_queue(struct request_queue *q) mutex_lock(&bsg_mutex); idr_remove(&bsg_minor_idr, bcd->minor); - sysfs_remove_link(&q->kobj, "bsg"); + if (q->kobj.sd) + sysfs_remove_link(&q->kobj, "bsg"); device_unregister(bcd->class_dev); bcd->class_dev = NULL; kref_put(&bcd->ref, bsg_kref_release_function); |