From d7847f2c1c24a214b4c3993bc7dce3236a557e33 Mon Sep 17 00:00:00 2001 From: Ernesto Ramos Date: Thu, 30 Sep 2010 13:49:36 -0500 Subject: [PATCH] --- yaml --- r: 220026 b: refs/heads/master c: 0ee5ab30d19c8e82fdf725c1f67cf71bb67c8373 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index daf060e44e8e..508339bde43a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d10009211ce12c70f8d9084745cadc413ddec7f2 +refs/heads/master: 0ee5ab30d19c8e82fdf725c1f67cf71bb67c8373 diff --git a/trunk/drivers/staging/tidspbridge/core/tiomap3430.c b/trunk/drivers/staging/tidspbridge/core/tiomap3430.c index f1e59e84ea38..e32e98a65a59 100644 --- a/trunk/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/trunk/drivers/staging/tidspbridge/core/tiomap3430.c @@ -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; @@ -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; }