Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175229
b: refs/heads/master
c: 727acb4
h: refs/heads/master
i:
  175227: 16e7096
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 8b22199 commit 125f745
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 988536981327c9b8d28a6e956de285791e137cd3
refs/heads/master: 727acb4fb2143ac7228b9a49f9e2f73f71e748d9
4 changes: 3 additions & 1 deletion trunk/drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ static dma_addr_t sep_shared_virt_to_bus(struct sep_device *sep,
void *virt_address)
{
dma_addr_t pa = sep->shared_bus + (virt_address - sep->shared_addr);
edbg("sep: virt to bus b %08llx v %p\n", pa, virt_address);
edbg("sep: virt to bus b %08llx v %p\n",
(unsigned long long)pa, virt_address);
return pa;
}

Expand Down Expand Up @@ -1788,6 +1789,7 @@ static int sep_create_flow_dma_tables_handler(struct sep_device *sep,
first_table_data.physical_address = 0xffffffff;

/* find the free structure for flow data */
error = -EINVAL;
flow_context_ptr = sep_find_flow_context(sep, SEP_FREE_FLOW_ID);
if (flow_context_ptr == NULL)
goto end_function;
Expand Down

0 comments on commit 125f745

Please sign in to comment.