Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220026
b: refs/heads/master
c: 0ee5ab3
h: refs/heads/master
v: v3
  • Loading branch information
Ernesto Ramos authored and Greg Kroah-Hartman committed Oct 5, 2010
1 parent dca3c6f commit d7847f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d10009211ce12c70f8d9084745cadc413ddec7f2
refs/heads/master: 0ee5ab30d19c8e82fdf725c1f67cf71bb67c8373
4 changes: 2 additions & 2 deletions trunk/drivers/staging/tidspbridge/core/tiomap3430.c
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ static int bridge_brd_stop(struct bridge_dev_context *dev_ctxt)
struct bridge_dev_context *dev_context = dev_ctxt;
struct pg_table_attrs *pt_attrs;
u32 dsp_pwr_state;
int clk_status;
struct dspbridge_platform_data *pdata =
omap_dspbridge_dev->dev.platform_data;

Expand Down Expand Up @@ -679,7 +678,8 @@ static int bridge_brd_stop(struct bridge_dev_context *dev_ctxt)
(*pdata->dsp_prm_write)(OMAP3430_RST1_IVA2_MASK | OMAP3430_RST2_IVA2_MASK |
OMAP3430_RST3_IVA2_MASK, OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);

clk_status = dsp_clk_disable(DSP_CLK_IVA2);
dsp_clock_disable_all(dev_context->dsp_per_clks);
dsp_clk_disable(DSP_CLK_IVA2);

return status;
}
Expand Down

0 comments on commit d7847f2

Please sign in to comment.