diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 22:29:55 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 22:29:55 (GMT) |
| commit | c21b04f9890ce35bfbb4f5ee1937017613f66017 (patch) | |
| tree | 0f15558258d2d67f8149d3378b0e6bb83f0d8a35 /lib/klist.c | |
| parent | 28c09ec4b6b7a2f9f769966baf54eaf0d6fadf8c (diff) | |
| parent | 18558cae0272f8fd9647e69d3fec1565a7949865 (diff) | |
| download | linux-c21b04f9890ce35bfbb4f5ee1937017613f66017.tar.xz | |
Merge 4.5-rc4 into driver-core-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/klist.c')
| -rw-r--r-- | lib/klist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/klist.c b/lib/klist.c index d74cf7a..0507fa5 100644 --- a/lib/klist.c +++ b/lib/klist.c @@ -282,9 +282,9 @@ void klist_iter_init_node(struct klist *k, struct klist_iter *i, struct klist_node *n) { i->i_klist = k; - i->i_cur = n; - if (n) - kref_get(&n->n_ref); + i->i_cur = NULL; + if (n && kref_get_unless_zero(&n->n_ref)) + i->i_cur = n; } EXPORT_SYMBOL_GPL(klist_iter_init_node); |