Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206015
b: refs/heads/master
c: 74ea8ff
h: refs/heads/master
i:
  206013: 4906c0b
  206011: 8620d83
  206007: 1210788
  205999: d2fe9eb
  205983: 7c5b23d
  205951: e1ad8db
v: v3
  • Loading branch information
Ernesto Ramos authored and Greg Kroah-Hartman committed Jul 28, 2010
1 parent 120eb80 commit 2b52520
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3448c5481cc4ae8bf19fae5002f0c4e43007da40
refs/heads/master: 74ea8ff93b3759f27e6677076fe80c0c9c3f209d
16 changes: 2 additions & 14 deletions trunk/drivers/staging/tidspbridge/rmgr/strm.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ static u32 refs; /* module reference count */

/* ----------------------------------- Function Prototypes */
static int delete_strm(struct strm_object *stream_obj);
static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj);

/*
* ======== strm_allocate_buffer ========
Expand Down Expand Up @@ -232,7 +231,7 @@ int strm_create(struct strm_mgr **strm_man,
if (DSP_SUCCEEDED(status))
*strm_man = strm_mgr_obj;
else
delete_strm_mgr(strm_mgr_obj);
kfree(strm_mgr_obj);

DBC_ENSURE((DSP_SUCCEEDED(status) && *strm_man) ||
(DSP_FAILED(status) && *strm_man == NULL));
Expand All @@ -250,7 +249,7 @@ void strm_delete(struct strm_mgr *strm_mgr_obj)
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(strm_mgr_obj);

delete_strm_mgr(strm_mgr_obj);
kfree(strm_mgr_obj);
}

/*
Expand Down Expand Up @@ -859,14 +858,3 @@ static int delete_strm(struct strm_object *stream_obj)
}
return status;
}

/*
* ======== delete_strm_mgr ========
* Purpose:
* Frees stream manager.
*/
static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj)
{
if (strm_mgr_obj)
kfree(strm_mgr_obj);
}

0 comments on commit 2b52520

Please sign in to comment.