Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block

[linux-beck.git] / drivers / scsi / sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 58ec8f4efcc25a53bf262b4898f2da601e965d17..5428d53f5a133992bef0114b785e2d54ebec1c0c 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1660,7 +1660,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;