diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /net/sctp/auth.c | |
parent | ALSA: hda/realtek - Clean up mute/mic GPIO LED handling (diff) | |
parent | ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk (diff) | |
download | linux-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.xz linux-a69862d8d04e4877965cc938140c9f8e6da0b827.zip |
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'net/sctp/auth.c')
-rw-r--r-- | net/sctp/auth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 0e8529113dc5..fb7976aee61c 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -862,8 +862,6 @@ int sctp_auth_set_key(struct sctp_endpoint *ep, list_add(&cur_key->key_list, sh_keys); cur_key->key = key; - sctp_auth_key_hold(key); - return 0; nomem: if (!replace) |