Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / drivers / misc / mic / scif / scif_rma.c

diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
index 263b8ad507eac76b4ba6fe7dbfc60e21b8d06002..0fb9b440dc70d6fd134557f7b193ab8e718244e3 100644 (file)
--- a/drivers/misc/mic/scif/scif_rma.c
+++ b/drivers/misc/mic/scif/scif_rma.c
@@ -663,8 +663,8 @@ int scif_unregister_window(struct scif_window *window)
        {
                window->unreg_state = OP_IN_PROGRESS;
                send_msg = true;
-               /* fall through */
        }
+               /* fall through */
        case OP_IN_PROGRESS:
        {
                scif_get_window(window, 1);