diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
| commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
| tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /drivers/reset/core.c | |
| parent | tcp: use page_ref_inc() in tcp_sendmsg() (diff) | |
| parent | ipv6: release dst on error in ip6_dst_lookup_tail (diff) | |
| download | linux-dev-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.xz linux-dev-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/reset/core.c')
| -rw-r--r-- | drivers/reset/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 10368ed8fd13..b6f5f1e1826c 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -163,7 +163,7 @@ int reset_control_reset(struct reset_control *rstc) } ret = rstc->rcdev->ops->reset(rstc->rcdev, rstc->id); - if (rstc->shared && !ret) + if (rstc->shared && ret) atomic_dec(&rstc->triggered_count); return ret; |