Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / tidspbridge / rmgr / strm.c

diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c
index ef2ec9497b1cc665d6b0f7ae42bf7a3d965e42d5..2e427149fb6c02a74f1147ab18d56f7f85fe8124 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/strm.c
+++ b/drivers/staging/tidspbridge/rmgr/strm.c
@@ -42,7 +42,6 @@
 /*  ----------------------------------- This */
 #include <dspbridge/strm.h>
 
-#include <dspbridge/cfg.h>
 #include <dspbridge/resourcecleanup.h>
 
 /*  ----------------------------------- Defines, Data Structures, Typedefs */
@@ -835,16 +834,9 @@ static int delete_strm(struct strm_object *stream_obj)
                         * is invalid. */
                        status = (*intf_fxns->pfn_chnl_close)
                                        (stream_obj->chnl_obj);
-                       /* Free all SM address translator resources */
-                       if (!status) {
-                               if (stream_obj->xlator) {
-                                       /* force free */
-                                       (void)cmm_xlator_delete(stream_obj->
-                                                               xlator,
-                                                               true);
-                               }
-                       }
                }
+               /* Free all SM address translator resources */
+               kfree(stream_obj->xlator);
                kfree(stream_obj);
        } else {
                status = -EFAULT;