From bac9e37d744f28ce4885e3fb1555f5e789317816 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:30:08 -0400 Subject: [PATCH] staging: unisys: fix symbol placement in spar_channel_client_acquire The && belongs at the end of the previous line, not the start of the next one. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/common-spar/include/channels/channel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h index d982afa..90677a8 100644 --- a/drivers/staging/unisys/common-spar/include/channels/channel.h +++ b/drivers/staging/unisys/common-spar/include/channels/channel.h @@ -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", -- 2.7.4