From 125f7457c7ab5d8401a5389636c1ca6310124fc4 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 17 Nov 2009 10:17:42 -0800 Subject: [PATCH] --- yaml --- r: 175229 b: refs/heads/master c: 727acb4fb2143ac7228b9a49f9e2f73f71e748d9 h: refs/heads/master i: 175227: 16e7096a8eebe67342ed0b3cac8f62ff5cdf209d v: v3 --- [refs] | 2 +- trunk/drivers/staging/sep/sep_driver.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7229585f420e..26643f9ab86f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 988536981327c9b8d28a6e956de285791e137cd3 +refs/heads/master: 727acb4fb2143ac7228b9a49f9e2f73f71e748d9 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index f890a16096c0..67c7d2ca7ca0 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -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; } @@ -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;