Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / net / sctp / input.c

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 98b69bbecdd96eadcbaeb3bdecc210dcca2ab11d..2a192a7c5d81b3380d5ae497cb3789eb9c8134be 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -23,9 +23,8 @@
  * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU CC; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with GNU CC; see the file COPYING.  If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * Please send any bug reports or fixes you make to the
  * email address(es):
@@ -537,8 +536,7 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb,
        return sk;
 
 out:
-       if (asoc)
-               sctp_association_put(asoc);
+       sctp_association_put(asoc);
        return NULL;
 }
 
@@ -546,8 +544,7 @@ out:
 void sctp_err_finish(struct sock *sk, struct sctp_association *asoc)
 {
        sctp_bh_unlock_sock(sk);
-       if (asoc)
-               sctp_association_put(asoc);
+       sctp_association_put(asoc);
 }
 
 /*