diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:53 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:53 +0800 |
| commit | fbb0b56de45bc81681eeeaec29e6c1e3ff12a200 (patch) | |
| tree | b40400c596280b6fe6b03641618bb73d196952c3 /drivers/md/bcache/super.c | |
| parent | 9d8a5571197f43541c8eec6d8d4dcd1ff4deecec (diff) | |
| parent | 19d0bd71d564448446bd851d752caf3e31520ac8 (diff) | |
Merge tag 'v3.10.100' into linux-linaro-lsk-v3.10lsk-v3.10-16.03linux-linaro-lsk-v3.10
This is the 3.10.100 stable release
Diffstat (limited to 'drivers/md/bcache/super.c')
| -rw-r--r-- | drivers/md/bcache/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index b4713cea1913..2d2915fdbf02 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1959,8 +1959,10 @@ static int __init bcache_init(void) closure_debug_init(); bcache_major = register_blkdev(0, "bcache"); - if (bcache_major < 0) + if (bcache_major < 0) { + unregister_reboot_notifier(&reboot); return bcache_major; + } if (!(bcache_wq = create_workqueue("bcache")) || !(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) || |