Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / tidspbridge / rmgr / node.c

diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 6e9441e..1562f3c 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -27,7 +27,6 @@
 #include <dspbridge/dbc.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
-#include <dspbridge/cfg.h>
 #include <dspbridge/list.h>
 #include <dspbridge/memdefs.h>
 #include <dspbridge/proc.h>
@@ -2506,7 +2505,6 @@ static void delete_node(struct node_object *hnode,
                        struct process_context *pr_ctxt)
 {
        struct node_mgr *hnode_mgr;
-       struct cmm_xlatorobject *xlator;
        struct bridge_drv_interface *intf_fxns;
        u32 i;
        enum node_type node_type;
@@ -2524,7 +2522,7 @@ static void delete_node(struct node_object *hnode,
        hnode_mgr = hnode->hnode_mgr;
        if (!hnode_mgr)
                goto func_end;
-       xlator = hnode->xlator;
+
        node_type = node_get_type(hnode);
        if (node_type != NODE_DEVICE) {
                node_msg_args = hnode->create_args.asa.node_msg_args;
@@ -2620,11 +2618,7 @@ static void delete_node(struct node_object *hnode,
        hnode->dcd_props.obj_data.node_obj.pstr_i_alg_name = NULL;
 
        /* Free all SM address translator resources */
-       if (xlator) {
-               (void)cmm_xlator_delete(xlator, true);  /* force free */
-               xlator = NULL;
-       }
-
+       kfree(hnode->xlator);
        kfree(hnode->nldr_node_obj);
        hnode->nldr_node_obj = NULL;
        hnode->hnode_mgr = NULL;