From 5b4bcff27d1ff32a624db2ad48cea6ae19542bac Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 6 Jan 2011 02:43:00 +0000 Subject: [PATCH] --- yaml --- r: 227205 b: refs/heads/master c: 73674648e9bf3b0a75000b7e97edaac255cd73f7 h: refs/heads/master i: 227203: d1d089503d2f7331afe75d7892e4dc30b08f9de2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9692e12f651d..d37958b9aa3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 025a10a76808cfd9e55dbf965d0f1453e4f8ae84 +refs/heads/master: 73674648e9bf3b0a75000b7e97edaac255cd73f7 diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index f59e93919e26..07b85c034d13 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -674,9 +674,8 @@ static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable) return -EIO; ret = __fsi_set_round_rate(fsib_clk, fsib_rate, enable); - clk_put(fsib_clk); if (ret < 0) - return ret; + goto fsi_set_rate_end; /* FSI DIV setting */ ret = __fsi_set_round_rate(fdiv_clk, fdiv_rate, enable); @@ -684,10 +683,14 @@ static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable) /* disable FSI B */ if (enable) __fsi_set_round_rate(fsib_clk, fsib_rate, 0); - return ret; + goto fsi_set_rate_end; } - return ackmd_bpfmd; + ret = ackmd_bpfmd; + +fsi_set_rate_end: + clk_put(fsib_clk); + return ret; } static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)