Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / megaraid.c

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index f066ec483beafbdec3619b552b8e270aec7d7bcb..76ad72d32c3f5ef8123b0b32b921de5ad7634f86 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -523,7 +523,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;
@@ -857,7 +857,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;