diff --git a/[refs] b/[refs] index b0c24303e2d4..f6ab63f8b685 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 135a829744067cb825b48f7422e22861e57d5ecd +refs/heads/master: 4cfe54e57910b59444d34a05284db27df416f20b diff --git a/trunk/drivers/clk/clk.c b/trunk/drivers/clk/clk.c index 593a2e42d4af..ad2ac94fede8 100644 --- a/trunk/drivers/clk/clk.c +++ b/trunk/drivers/clk/clk.c @@ -1093,9 +1093,6 @@ int clk_set_rate(struct clk *clk, unsigned long rate) /* change the rates */ clk_change_rate(top); - mutex_unlock(&prepare_lock); - - return 0; out: mutex_unlock(&prepare_lock);