---

yaml --- r: 213043 b: refs/heads/master c: 2610a25 h: refs/heads/master i: 213041: dea0020 213039: ddd966a v: v3
git-mirror · Sep 16, 2010 · 51b79ab · 51b79ab
1 parent a7657f2
commit 51b79ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5af921ec02333e943efb59aca4f56b78fc0e100
+refs/heads/master: 2610a25406087ef797f4187e7f82dd04335056c7
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
@@ -1657,7 +1657,7 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd)
 	if (sg_allow_dio && hp->flags & SG_FLAG_DIRECT_IO &&
 	    dxfer_dir != SG_DXFER_UNKNOWN && !iov_count &&
 	    !sfp->parentdp->device->host->unchecked_isa_dma &&
-	    blk_rq_aligned(q, hp->dxferp, dxfer_len))
+	    blk_rq_aligned(q, (unsigned long)hp->dxferp, dxfer_len))
 		md = NULL;
 	else
 		md = &map_data;