Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284438
b: refs/heads/master
c: c755201
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook authored and Linus Torvalds committed Jan 13, 2012
1 parent 6dc3a7f commit ff7c1d8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 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: fdb5950754eb3dedb9fea7c8828d3e51d9dbc3f7
refs/heads/master: c755201eb5c1e09f3477d0e83ae1e3aadac0e8d1
17 changes: 9 additions & 8 deletions trunk/drivers/char/ramoops.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,6 @@ static int __init ramoops_probe(struct platform_device *pdev)
cxt->phys_addr = pdata->mem_address;
cxt->record_size = pdata->record_size;
cxt->dump_oops = pdata->dump_oops;
/*
* Update the module parameter variables as well so they are visible
* through /sys/module/ramoops/parameters/
*/
mem_size = pdata->mem_size;
mem_address = pdata->mem_address;
record_size = pdata->record_size;
dump_oops = pdata->dump_oops;

if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) {
pr_err("request mem region failed\n");
Expand All @@ -175,6 +167,15 @@ static int __init ramoops_probe(struct platform_device *pdev)
goto fail1;
}

/*
* Update the module parameter variables as well so they are visible
* through /sys/module/ramoops/parameters/
*/
mem_size = pdata->mem_size;
mem_address = pdata->mem_address;
record_size = pdata->record_size;
dump_oops = pdata->dump_oops;

return 0;

fail1:
Expand Down

0 comments on commit ff7c1d8

Please sign in to comment.