From patchwork Sat Apr 17 03:23:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ramos Falcon, Ernesto" X-Patchwork-Id: 93269 X-Patchwork-Delegate: omar.ramirez@ti.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3H3NYd2019893 for ; Sat, 17 Apr 2010 03:23:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758721Ab0DQDX1 (ORCPT ); Fri, 16 Apr 2010 23:23:27 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:47424 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758713Ab0DQDX0 convert rfc822-to-8bit (ORCPT ); Fri, 16 Apr 2010 23:23:26 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3H3NMQC013456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 16 Apr 2010 22:23:22 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o3H3NLFw014144; Fri, 16 Apr 2010 22:23:21 -0500 (CDT) Received: from dsbe71.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o3H3NLKD022448; Fri, 16 Apr 2010 22:23:21 -0500 (CDT) Received: from dlee01.ent.ti.com ([157.170.170.12]) by dsbe71.ent.ti.com ([156.117.232.23]) with mapi; Fri, 16 Apr 2010 22:23:21 -0500 From: "Ramos Falcon, Ernesto" To: "linux-omap@vger.kernel.org" CC: Ameya Palande , "Doyu Hiroshi (Nokia-D/Helsinki)" , "Contreras Felipe (Nokia-D/Helsinki)" Date: Fri, 16 Apr 2010 22:23:19 -0500 Subject: [PATCH] DSPBRIDGE: Always delete nodes during resource cleanup Thread-Topic: [PATCH] DSPBRIDGE: Always delete nodes during resource cleanup Thread-Index: Acrd3VPYCkmBwlF3Sm29hIE9IYHwKQ== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 17 Apr 2010 03:23:38 +0000 (UTC) diff --git a/drivers/dsp/bridge/rmgr/drv.c b/drivers/dsp/bridge/rmgr/drv.c index 98f9b78..75b9b9f 100644 --- a/drivers/dsp/bridge/rmgr/drv.c +++ b/drivers/dsp/bridge/rmgr/drv.c @@ -157,17 +157,11 @@ static dsp_status drv_proc_free_node_res(bhandle hPCtxt) if (node_state <= NODE_DELETING) { if ((node_state == NODE_RUNNING) || (node_state == NODE_PAUSED) || - (node_state == NODE_TERMINATING)) { + (node_state == NODE_TERMINATING)) status = node_terminate (node_res_obj->hnode, &status); - status = - node_delete(node_res_obj->hnode, - ctxt); - } else if ((node_state == NODE_ALLOCATED) - || (node_state == NODE_CREATED)) - status = - node_delete(node_res_obj->hnode, - ctxt); + + status = node_delete(node_res_obj->hnode, ctxt); } } }