Merge branch 'pm-cpuidle' into fixes

[~andy/linux] / net / sctp / sm_sideeffect.c

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index c9577754a70825cd00da2a24854a441c93dac09a..8aab894aeabeecb410c9763e33824f5dec7a6c91 100644 (file)
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -674,10 +674,8 @@ static void sctp_cmd_t3_rtx_timers_stop(sctp_cmd_seq_t *cmds,
 
        list_for_each_entry(t, &asoc->peer.transport_addr_list,
                        transports) {
-               if (timer_pending(&t->T3_rtx_timer) &&
-                   del_timer(&t->T3_rtx_timer)) {
+               if (del_timer(&t->T3_rtx_timer))
                        sctp_transport_put(t);
-               }
        }
 }
 
@@ -1517,7 +1515,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
 
                case SCTP_CMD_TIMER_STOP:
                        timer = &asoc->timers[cmd->obj.to];
-                       if (timer_pending(timer) && del_timer(timer))
+                       if (del_timer(timer))
                                sctp_association_put(asoc);
                        break;