diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-03-23 13:52:59 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-03-23 13:52:59 -0700 |
| commit | 8c3eb42a39fb56b16a92ae6dd6285f7675b23295 (patch) | |
| tree | ddfad3fcf2f33309e80d9a25dacbff104143531a /drivers/rpmsg | |
| parent | a7a2f524e61b929bc7092d4b41198444ad6dd1d0 (diff) | |
| parent | dd797592eb1ddbb829e1c9458175d8f386c5f074 (diff) | |
| download | kernel_samsung_tuna-8c3eb42a39fb56b16a92ae6dd6285f7675b23295.zip kernel_samsung_tuna-8c3eb42a39fb56b16a92ae6dd6285f7675b23295.tar.gz kernel_samsung_tuna-8c3eb42a39fb56b16a92ae6dd6285f7675b23295.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/rpmsg')
| -rw-r--r-- | drivers/rpmsg/rpmsg_resmgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rpmsg/rpmsg_resmgr.c b/drivers/rpmsg/rpmsg_resmgr.c index a13094d..c98a1b9 100644 --- a/drivers/rpmsg/rpmsg_resmgr.c +++ b/drivers/rpmsg/rpmsg_resmgr.c @@ -214,7 +214,6 @@ static int rprm_auxclk_request(struct rprm_elem *e, struct rprm_auxclk *obj) if (ret) { pr_err("%s: rate not supported by %s\n", __func__, clk_src_name[obj->parent_src_clk]); - ret = -EINVAL; goto error_aux_src_parent; } @@ -236,7 +235,7 @@ static int rprm_auxclk_request(struct rprm_elem *e, struct rprm_auxclk *obj) ret = clk_set_rate(acd->aux_clk, (obj->clk_rate * MHZ)); if (ret) { pr_err("%s: rate not supported by %s\n", __func__, clk_name); - goto error_aux_src_parent; + goto error_aux_enable; } ret = clk_enable(acd->aux_clk); |