diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-05 10:16:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-05 10:16:50 +0000 |
| commit | a8eb5f1e4b10d8b7992ed0e6c0915687339201c3 (patch) | |
| tree | 69dbf24ffe53feb88b2189d22f6092314daa8231 /block | |
| parent | 302774e6db8e9845bf065a781237a2bb808186bb (diff) | |
| parent | dffe2a3eed105c631500778dfaba0998d7bf8512 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts (add/add):
drivers/input/evdev.c
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index f6fcc970934..76e0b0d79a1 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -645,10 +645,12 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); if (blkcg_init_queue(q)) - goto fail_id; + goto fail_bdi; return q; +fail_bdi: + bdi_destroy(&q->backing_dev_info); fail_id: ida_simple_remove(&blk_queue_ida, q->id); fail_q: |