Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

[deliverable/linux.git] / drivers / scsi / megaraid.c

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 4d39a9ffc0813a32882e5c6469ccbdfce2eee206..97825f11695445d0c3ebed84ec6ac3dd5fc9022e 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -524,7 +524,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
        mega_passthru   *pthru;
        scb_t   *scb;
        mbox_t  *mbox;
-       long    seg;
+       u32     seg;
        char    islogical;
        int     max_ldrv_num;
        int     channel = 0;
@@ -858,7 +858,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
 
                        /* Calculate Scatter-Gather info */
                        mbox->m_out.numsgelements = mega_build_sglist(adapter, scb,
-                                       (u32 *)&mbox->m_out.xferaddr, (u32 *)&seg);
+                                       (u32 *)&mbox->m_out.xferaddr, &seg);
 
                        return scb;