diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-11 08:31:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-11 08:31:11 +0100 |
| commit | 35eeacf1820a08305c2b0960febfa190f5a6dd63 (patch) | |
| tree | f1227c7384ee01d3f029cc5f82223234e6456c5f /fs/pstore/ram.c | |
| parent | gtp: add MAINTAINERS (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-35eeacf1820a08305c2b0960febfa190f5a6dd63.tar.xz linux-35eeacf1820a08305c2b0960febfa190f5a6dd63.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'fs/pstore/ram.c')
| -rw-r--r-- | fs/pstore/ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 27c059e1760a..1d887efaaf71 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -280,7 +280,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type, 1, id, type, PSTORE_TYPE_PMSG, 0); /* ftrace is last since it may want to dynamically allocate memory. */ - if (!prz_ok(prz)) { + if (!prz_ok(prz) && cxt->fprzs) { if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)) { prz = ramoops_get_next_prz(cxt->fprzs, &cxt->ftrace_read_cnt, 1, id, type, |