diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-11-30 12:56:55 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-11-30 12:56:55 +0100 |
| commit | 1f195e557d137be004894d2016357013331ec3d0 (patch) | |
| tree | ac74e64b08349fc569e9db2edcf32c4bf84b0c9b /net/atm | |
| parent | perf build-id: Add build_id_cache__add function (diff) | |
| parent | Linux 5.10-rc6 (diff) | |
| download | linux-1f195e557d137be004894d2016357013331ec3d0.tar.xz linux-1f195e557d137be004894d2016357013331ec3d0.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/lec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index dbabb65d8b67..7226c784dbe0 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -954,9 +954,8 @@ static void *lec_seq_next(struct seq_file *seq, void *v, loff_t *pos) { struct lec_state *state = seq->private; - v = lec_get_idx(state, 1); - *pos += !!PTR_ERR(v); - return v; + ++*pos; + return lec_get_idx(state, 1); } static int lec_seq_show(struct seq_file *seq, void *v) |