Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206041
b: refs/heads/master
c: 8df327c
h: refs/heads/master
i:
  206039: d3d2043
v: v3
  • Loading branch information
Ernesto Ramos authored and Greg Kroah-Hartman committed Aug 3, 2010
1 parent 8ee101f commit 0299298
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 0624f52f77e11a6edfc48827a12190f874d572b8
refs/heads/master: 8df327c3904d34527b89d4881bd3ce2966f0e07f
6 changes: 4 additions & 2 deletions trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ inline void find_node_handle(struct node_res_object **noderes,
{
rcu_read_lock();
*noderes = idr_find(((struct process_context *)pr_ctxt)->node_id,
(int)hnode);
(int)hnode - 1);
rcu_read_unlock();
return;
}
Expand All @@ -1077,6 +1077,7 @@ u32 nodewrap_allocate(union trapped_args *args, void *pr_ctxt)
u8 *pargs = NULL;
struct dsp_nodeattrin proc_attr_in, *attr_in = NULL;
struct node_res_object *node_res;
int nodeid;

/* Optional argument */
if (psize) {
Expand Down Expand Up @@ -1112,7 +1113,8 @@ u32 nodewrap_allocate(union trapped_args *args, void *pr_ctxt)
attr_in, &node_res, pr_ctxt);
}
if (!status) {
CP_TO_USR(args->args_node_allocate.ph_node, &node_res->id,
nodeid = node_res->id + 1;
CP_TO_USR(args->args_node_allocate.ph_node, &nodeid,
status, 1);
if (status) {
status = -EFAULT;
Expand Down

0 comments on commit 0299298

Please sign in to comment.