Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228363
b: refs/heads/master
c: bc657f6
h: refs/heads/master
i:
  228361: 3769fe7
  228359: a05ca36
v: v3
  • Loading branch information
Mark Allyn authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent 1cb9300 commit c07ac29
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: e91eb2ff1f713837caebbb86a06974cd4b3e8e46
refs/heads/master: bc657f6e9130108651915fe37624e47638c46e0f
4 changes: 1 addition & 3 deletions trunk/drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -2545,10 +2545,8 @@ static int sep_free_dma_tables_and_dcb(struct sep_device *sep, bool isapplet,
/**
* sep_get_static_pool_addr_handler - get static pool address
* @sep: pointer to struct sep_device
* @arg: parameters from user space application
*
* This function sets the bus and virtual addresses of the static pool
* and returns the virtual address
*/
static int sep_get_static_pool_addr_handler(struct sep_device *sep)
{
Expand Down Expand Up @@ -3036,7 +3034,7 @@ static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
error = -EPERM; /* Not permitted on new chip */
break;
case SEP_IOCGETSTATICPOOLADDR:
/* Get the physical and virtual addresses of the static pool */
/* Inform the SEP the bus address of the static pool */
error = sep_get_static_pool_addr_handler(sep);
break;
case SEP_IOCENDTRANSACTION:
Expand Down

0 comments on commit c07ac29

Please sign in to comment.