openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: visorchipset: parser_init_guts(): Localize memregion usage 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2015-05-05 18:36:25 -04:00 committed by Greg Kroah-Hartman
parent 75d1e6613c
commit 712c03dcab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -399,6 +399,7 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
struct parser_context *ctx = NULL;
struct memregion *rgn = NULL;
struct spar_controlvm_parameters_header *phdr = NULL;
int cnt;
if (retry)
*retry = false;
@ -442,7 +443,10 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
rc = NULL;
goto cleanup;
}
if (visor_memregion_read(rgn, 0, ctx->data, bytes) < 0) {
cnt = visor_memregion_read(rgn, 0, ctx->data, bytes);
visor_memregion_destroy(rgn);
if (cnt < 0) {
rc = NULL;
goto cleanup;
}
@ -469,10 +473,6 @@ parser_init_guts(u64 addr, u32 bytes, bool local,
rc = ctx;
cleanup:
if (rgn) {
visor_memregion_destroy(rgn);
rgn = NULL;
}
if (rc) {
controlvm_payload_bytes_buffered += ctx->param_bytes;
} else {