Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162363
b: refs/heads/master
c: 43e8c4a
h: refs/heads/master
i:
  162361: 237e34c
  162359: 33c2f2f
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 0798e5e commit ef7bf4e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 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: f93e4bf953d125d634cb6a2c06aacfde18d3de05
refs/heads/master: 43e8c4a3ceb2d92a89612c858753cbda0b505163
13 changes: 1 addition & 12 deletions trunk/drivers/staging/sep/sep_main_mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -1942,9 +1942,6 @@ static int sep_add_flow_tables_handler(unsigned long arg)

/* send the parameters to user application */
error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_add_flow_table_t));
if (error)
goto end_function_with_error;

end_function_with_error:
/* free the allocated tables */
sep_deallocated_flow_tables(&first_table_data);
Expand Down Expand Up @@ -2006,9 +2003,6 @@ static int sep_get_static_pool_addr_handler(unsigned long arg)

/* send the parameters to user application */
error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_static_pool_addr_t));
if (error)
goto end_function;
end_function:
dbg("SEP Driver:<-------- sep_get_static_pool_addr_handler end\n");
return error;
}
Expand Down Expand Up @@ -2040,8 +2034,6 @@ static int sep_get_physical_mapped_offset_handler(unsigned long arg)

/* send the parameters to user application */
error = copy_to_user((void *) arg, &command_args, sizeof(struct sep_driver_get_mapped_offset_t));
if (error)
goto end_function;
end_function:
dbg("SEP Driver:<-------- sep_get_physical_mapped_offset_handler end\n");
return error;
Expand All @@ -2064,11 +2056,9 @@ static int sep_start_handler(void)
while (!reg_val);

/* check the value */
if (reg_val == 0x1) {
if (reg_val == 0x1)
/* fatal error - read erro status from GPRO */
error = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
goto end_function;
}
end_function:
dbg("SEP Driver:<-------- sep_start_handler end\n");
return error;
Expand Down Expand Up @@ -2134,7 +2124,6 @@ static int sep_init_handler(unsigned long arg)
/* fatal error - read erro status from GPRO */
error = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
edbg("SEP Driver:error is %lu\n", error);
goto end_function;
}
end_function:
dbg("SEP Driver:<-------- sep_init_handler end\n");
Expand Down

0 comments on commit ef7bf4e

Please sign in to comment.