1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 05ea5944c487..7577c2417e2e 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -242,7 +242,7 @@ mptctl_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)
                 /* Set the command status to GOOD if IOC Status is GOOD
                  * OR if SCSI I/O cmd and data underrun or recovered error.
                  */
-                iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK;
+                iocStatus = le16_to_cpu(reply->u.reply.IOCStatus) & MPI_IOCSTATUS_MASK;
                 if (iocStatus  == MPI_IOCSTATUS_SUCCESS)
                         ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD;
 
@@ -2324,7 +2324,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_MANUFACTURING;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -2333,7 +2333,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
 
         strncpy(karg.serial_number, " ", 24);
         if (mpt_config(ioc, &cfg) == 0) {
-                if (cfg.hdr->PageLength > 0) {
+                if (cfg.cfghdr.hdr->PageLength > 0) {
                         /* Issue the second config page request */
                         cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
 
@@ -2479,7 +2479,7 @@ mptctl_hp_targetinfo(unsigned long arg)
                 hdr.PageNumber = 0;
                 hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
 
-                cfg.hdr = &hdr;
+                cfg.cfghdr.hdr = &hdr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
                 cfg.dir = 0;
                 cfg.timeout = 0;
@@ -2527,15 +2527,15 @@ mptctl_hp_targetinfo(unsigned long arg)
         hdr.PageNumber = 3;
         hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
 
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
         cfg.timeout = 0;
         cfg.physAddr = -1;
-        if ((mpt_config(ioc, &cfg) == 0) && (cfg.hdr->PageLength > 0)) {
+        if ((mpt_config(ioc, &cfg) == 0) && (cfg.cfghdr.hdr->PageLength > 0)) {
                 /* Issue the second config page request */
                 cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
-                data_sz = (int) cfg.hdr->PageLength * 4;
+                data_sz = (int) cfg.cfghdr.hdr->PageLength * 4;
                 pg3_alloc = (SCSIDevicePage3_t *) pci_alloc_consistent(
                                                         ioc->pcidev, data_sz, &page_dma);
                 if (pg3_alloc) {