Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

1 files changed, 1 insertions, 3 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 5a37188b559f..9d359e05fad7 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1331,10 +1331,8 @@ int blkcg_policy_register(struct blkcg_policy *pol)
                         struct blkcg_policy_data *cpd;
 
                         cpd = pol->cpd_alloc_fn(GFP_KERNEL);
-                        if (!cpd) {
-                                mutex_unlock(&blkcg_pol_mutex);
+                        if (!cpd)
                                 goto err_free_cpds;
-                        }
 
                         blkcg->cpd[pol->plid] = cpd;
                         cpd->blkcg = blkcg;