diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-09-26 16:09:39 -0700 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-09-26 16:09:39 -0700 |
commit | b6b2fe5b6e956c8217a7584472a3ac5c068b61d4 (patch) | |
tree | 899d38684e674a05fc3e4ae2885529b916583323 /block/blk-sysfs.c | |
parent | b52f4914f3be3ff50e7308e3ce03a2ce71195ecc (diff) | |
parent | b9e742c3164344fece3615aca42ec51b41753908 (diff) |
Merge tag 'tegra-clk-3.18' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next
Tegra clk updates for 3.18
Diffstat (limited to 'block/blk-sysfs.c')
-rw-r--r-- | block/blk-sysfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 4db5abf96b9e..17f5c84ce7bf 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -554,8 +554,10 @@ int blk_register_queue(struct gendisk *disk) * Initialization must be complete by now. Finish the initial * bypass from queue allocation. */ - queue_flag_set_unlocked(QUEUE_FLAG_INIT_DONE, q); - blk_queue_bypass_end(q); + if (!blk_queue_init_done(q)) { + queue_flag_set_unlocked(QUEUE_FLAG_INIT_DONE, q); + blk_queue_bypass_end(q); + } ret = blk_trace_init_sysfs(dev); if (ret) |