Fixes: 3d44a78f0d8b ("staging: rtl8712: Remove unnecessary 'else'")
authorMatthew Kilgore <mattkilgore12@gmail.com>
Wed, 28 Sep 2016 03:07:54 +0000 (23:07 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Sep 2016 06:10:36 +0000 (08:10 +0200)
An "unnecessary" 'else' was removed due to complains from checkpatch.pl
as it is preceded by a 'return', however the 'else' branch is necessary
as an earlier branch of the 'if' falls through. By removing the 'else',
that route now hits the 'break' and the 'while' loop exits prematurely.

This commit reverts that change and puts the original 'else' back in
place.

Signed-off-by: Matthew Kilgore <mattkilgore12@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl8712_recv.c

index cf46592be47238e581dfb5fe13b902a59621d24b..66f0e0a35167df655ea07c3c59302633a185e825 100644 (file)
@@ -508,7 +508,8 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,
                        plist = plist->next;
                else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num))
                        return false;
-               break;
+               else
+                       break;
        }
        list_del_init(&(prframe->u.hdr.list));
        list_add_tail(&(prframe->u.hdr.list), plist);