From ab70d44b13735d73dbaaeee6bcd642c4438069bb Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 27 Jun 2012 12:08:25 +0300 Subject: [PATCH] --- yaml --- r: 316789 b: refs/heads/master c: 9d5d93e32a365f962fb26ebd19c0b4a392f38e64 h: refs/heads/master i: 316787: a0464d227f6fd2d09491192e98d1c666a636f0a8 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7324fe713944..5dc2d95578cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5254dbb17dd22999f808e646780c32858a3eafa +refs/heads/master: 9d5d93e32a365f962fb26ebd19c0b4a392f38e64 diff --git a/trunk/drivers/scsi/megaraid.c b/trunk/drivers/scsi/megaraid.c index 4d39a9ffc081..97825f116954 100644 --- a/trunk/drivers/scsi/megaraid.c +++ b/trunk/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;