Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228207
b: refs/heads/master
c: 6f89be9
h: refs/heads/master
i:
  228205: 71c411c
  228203: 53d7666
  228199: 2e07e30
  228191: 6aacaa5
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Nov 29, 2010
1 parent 5e1a7b0 commit cf36fe0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 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: 2bb3af58d0f712c728cf1230539044d94c9a3be0
refs/heads/master: 6f89be93ce6e718a51215336845c70ada06627ba
16 changes: 5 additions & 11 deletions trunk/drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1037,8 +1037,6 @@ static int sep_allocate_data_pool_memory_handler(struct sep_device *sep,
sizeof(struct alloc_struct));
if (error) {
error = -EFAULT;
dev_warn(&sep->pdev->dev,
"allocate data pool copy to user error\n");
goto end_function;
}

Expand Down Expand Up @@ -1083,13 +1081,10 @@ static int sep_lock_kernel_pages(struct sep_device *sep,
/* Map array */
struct sep_dma_map *map_array;

dev_dbg(&sep->pdev->dev,
"sep_lock_kernel_pages start\n");

dev_dbg(&sep->pdev->dev,
"kernel_virt_addr is %08x\n", kernel_virt_addr);
dev_dbg(&sep->pdev->dev,
"data_size is %x\n", data_size);
dev_dbg(&sep->pdev->dev, "sep_lock_kernel_pages start\n");
dev_dbg(&sep->pdev->dev, "kernel_virt_addr is %08x\n",
kernel_virt_addr);
dev_dbg(&sep->pdev->dev, "data_size is %x\n", data_size);

lli_array = kmalloc(sizeof(struct sep_lli_entry), GFP_ATOMIC);
if (!lli_array) {
Expand Down Expand Up @@ -1182,8 +1177,7 @@ static int sep_lock_user_pages(struct sep_device *sep,
/* Direction of the DMA mapping for locked pages */
enum dma_data_direction dir;

dev_dbg(&sep->pdev->dev,
"sep_lock_user_pages start\n");
dev_dbg(&sep->pdev->dev, "sep_lock_user_pages start\n");

/* Set start and end pages and num pages */
end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT;
Expand Down

0 comments on commit cf36fe0

Please sign in to comment.