Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 17:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Benjamin Romer 2014-09-22 13:45:03 -04:00 committed by Greg Kroah-Hartman
parent 24fc2d01db
commit 35b8117b0a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/unisys/common-spar/include/channels/channel.h
View File

@ -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;
}