diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 10:22:51 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 10:22:51 +0300 |
| commit | 9fe64e15148d1ff81fa0bcb5fd58531e3ae2aa3a (patch) | |
| tree | 602da9e86cd3dfc4fae846dceb6fba87aa7ca30b /lib/timerqueue.c | |
| parent | fd5d666932d51b2552ecc0280047d6b35d9b6cd1 (diff) | |
| parent | c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff) | |
| download | linux-9fe64e15148d1ff81fa0bcb5fd58531e3ae2aa3a.tar.xz | |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to 'lib/timerqueue.c')
| -rw-r--r-- | lib/timerqueue.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/timerqueue.c b/lib/timerqueue.c index adc6ee0a5126..4a720ed4fdaf 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c @@ -80,8 +80,7 @@ bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) if (head->next == node) { struct rb_node *rbn = rb_next(&node->node); - head->next = rbn ? - rb_entry(rbn, struct timerqueue_node, node) : NULL; + head->next = rb_entry_safe(rbn, struct timerqueue_node, node); } rb_erase(&node->node, &head->head); RB_CLEAR_NODE(&node->node); |