Message ID | 1487596931-26975-1-git-send-email-mukesh02@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Commit | a5bbe8fd29f7e42fe5d26371adbad97c76884355 |
Headers | show |
On Mon, 2017-02-20 at 13:22:10 UTC, Mukesh Ojha wrote: > Moves the return value check of 'opal_dump_info' to a proper place which > was previously unnecessarily filling all the dump info even on failure. > > Signed-off-by: Mukesh Ojha <mukesh02@linux.vnet.ibm.com> > Acked-by: Stewart Smith <stewart@linux.vnet.ibm.com> > Acked-by: Jeremy Kerr <jk@ozlabs.org> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/a5bbe8fd29f7e42fe5d26371adbad9 cheers
diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c index 4c82782..ae32212 100644 --- a/arch/powerpc/platforms/powernv/opal-dump.c +++ b/arch/powerpc/platforms/powernv/opal-dump.c @@ -225,13 +225,16 @@ static int64_t dump_read_info(uint32_t *dump_id, uint32_t *dump_size, uint32_t * if (rc == OPAL_PARAMETER) rc = opal_dump_info(&id, &size); + if (rc) { + pr_warn("%s: Failed to get dump info (%d)\n", + __func__, rc); + return rc; + } + *dump_id = be32_to_cpu(id); *dump_size = be32_to_cpu(size); *dump_type = be32_to_cpu(type); - if (rc) - pr_warn("%s: Failed to get dump info (%d)\n", - __func__, rc); return rc; }