staging: unisys: fix IO memory copy in channel.h

The function ULTRA_check_channel_client() was recently patched to use
ioread8_rep(). Unfortunately the parameters were incorrectly ordered, and this
causes the function to fail and the guest to not boot.

This patch switches the parameters around and uses memcpy_fromio() instead,
which is clearer since a structure is being copied, not an array, and it
fixes the error message printout later in the function that was using the UUID
value in the channel, rather than the value copied from the channel, which
causes a misleading error to be reported.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 5ba5e566be9afcc70e2f74f1dd537cdfe683b870..4af9457ac3a78072894aa2392ed481ca6e0d7cba 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -350,14 +350,14 @@ ULTRA_check_channel_client(void __iomem *pChannel,
        if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0) {
                uuid_le guid;
 
-               ioread8_rep(&((CHANNEL_HEADER __iomem *)(pChannel))->Type,
-                       &guid, sizeof(guid));
+               memcpy_fromio(&guid,
+                             &((CHANNEL_HEADER __iomem *)(pChannel))->Type,
+                             sizeof(guid));
                /* caller wants us to verify type GUID */
                if (uuid_le_cmp(guid, expectedTypeGuid) != 0) {
                        CHANNEL_GUID_MISMATCH(expectedTypeGuid, channelName,
                                              "type", expectedTypeGuid,
-                                             ((CHANNEL_HEADER __iomem *)
-                                              (pChannel))->Type, fileName,
+                                             guid, fileName,
                                              lineNumber, logCtx);
                        return 0;
                }