diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-12 20:54:16 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-12 20:54:16 +0100 |
| commit | 8fb63b607364aa2ace6ec64df0bba74474103986 (patch) | |
| tree | 5e43622853942c4544af63b3bc7ca9aa85e604be /block | |
| parent | 2dc23110650332721bc8318972d8d96166eb480b (diff) | |
| parent | 12b4af6966843baf7bb3aedbae93e69ae19405b0 (diff) | |
| download | kernel_samsung_crespo-8fb63b607364aa2ace6ec64df0bba74474103986.zip kernel_samsung_crespo-8fb63b607364aa2ace6ec64df0bba74474103986.tar.gz kernel_samsung_crespo-8fb63b607364aa2ace6ec64df0bba74474103986.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
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 0c8b64a..792ead6 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); |