From bc67c5a7cdcc8b8aaf080ad3319b6356a219be1c Mon Sep 17 00:00:00 2001 From: Omar Ramirez Luna Date: Tue, 21 Feb 2012 20:46:21 -0600 Subject: [PATCH] --- yaml --- r: 289141 b: refs/heads/master c: 08cd9ef4eca0b53cdae190b718e4945408c7d3b8 h: refs/heads/master i: 289139: 55c8b230e9a1fd629719661679cc11f1d081fffe v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/core/tiomap3430.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d439d8a80d21..293735fba992 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18db4fe09886691a781f3d1e4589ede0239d8ee2 +refs/heads/master: 08cd9ef4eca0b53cdae190b718e4945408c7d3b8 diff --git a/trunk/drivers/staging/tidspbridge/core/tiomap3430.c b/trunk/drivers/staging/tidspbridge/core/tiomap3430.c index 670de0aae928..7862513cc295 100644 --- a/trunk/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/trunk/drivers/staging/tidspbridge/core/tiomap3430.c @@ -383,6 +383,7 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt, u32 clk_cmd; struct io_mgr *hio_mgr; u32 ul_load_monitor_timer; + u32 wdt_en = 0; struct omap_dsp_platform_data *pdata = omap_dspbridge_dev->dev.platform_data; @@ -594,9 +595,12 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt, if (!wait_for_start(dev_context, dw_sync_addr)) status = -ETIMEDOUT; - /* Start wdt */ - dsp_wdt_sm_set((void *)ul_shm_base); - dsp_wdt_enable(true); + dev_get_symbol(dev_context->dev_obj, "_WDT_enable", &wdt_en); + if (wdt_en) { + /* Start wdt */ + dsp_wdt_sm_set((void *)ul_shm_base); + dsp_wdt_enable(true); + } status = dev_get_io_mgr(dev_context->dev_obj, &hio_mgr); if (hio_mgr) {