diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-03-23 13:52:36 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-03-23 13:52:36 -0700 |
| commit | dd797592eb1ddbb829e1c9458175d8f386c5f074 (patch) | |
| tree | 2f89cfba2e65e18ef5fb3d15968d376cba1947c9 /drivers | |
| parent | b0cf6b3fc9198a57b3eb62ed6c826bf7d08d5170 (diff) | |
| parent | b5368bdd16b7e4fc9e042d15fdc945c90e6e298a (diff) | |
| download | kernel_samsung_tuna-dd797592eb1ddbb829e1c9458175d8f386c5f074.zip kernel_samsung_tuna-dd797592eb1ddbb829e1c9458175d8f386c5f074.tar.gz kernel_samsung_tuna-dd797592eb1ddbb829e1c9458175d8f386c5f074.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'drivers')
| -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); |