OSDN Git Service

staging: unisys: fix symbol placement in spar_channel_client_acquire
authorBenjamin Romer <benjamin.romer@unisys.com>
Thu, 23 Oct 2014 18:30:08 +0000 (14:30 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Oct 2014 02:33:09 +0000 (10:33 +0800)
The && belongs at the end of the previous line, not the start of the
next one.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/common-spar/include/channels/channel.h

index d982afa..90677a8 100644 (file)
@@ -398,8 +398,8 @@ spar_channel_client_acquire_os(void __iomem *ch, u8 *id)
                }
                return 0;
        }
-       if ((readl(&hdr->cli_state_os) != CHANNELCLI_OWNED)
-           && (readl(&hdr->cli_state_boot) == CHANNELCLI_DISABLED)) {
+       if ((readl(&hdr->cli_state_os) != CHANNELCLI_OWNED) &&
+           (readl(&hdr->cli_state_boot) == CHANNELCLI_DISABLED)) {
                /* Our competitor is DISABLED, so we can transition to OWNED */
                pr_info("%s Channel StateTransition (%s) %s(%d)-->%s(%d)\n",
                        id, "cli_state_os",