Commit bac9e37d authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

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: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a17f5b4a
...@@ -398,8 +398,8 @@ spar_channel_client_acquire_os(void __iomem *ch, u8 *id) ...@@ -398,8 +398,8 @@ spar_channel_client_acquire_os(void __iomem *ch, u8 *id)
} }
return 0; return 0;
} }
if ((readl(&hdr->cli_state_os) != CHANNELCLI_OWNED) if ((readl(&hdr->cli_state_os) != CHANNELCLI_OWNED) &&
&& (readl(&hdr->cli_state_boot) == CHANNELCLI_DISABLED)) { (readl(&hdr->cli_state_boot) == CHANNELCLI_DISABLED)) {
/* Our competitor is DISABLED, so we can transition to OWNED */ /* Our competitor is DISABLED, so we can transition to OWNED */
pr_info("%s Channel StateTransition (%s) %s(%d)-->%s(%d)\n", pr_info("%s Channel StateTransition (%s) %s(%d)-->%s(%d)\n",
id, "cli_state_os", id, "cli_state_os",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment