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

[pandora-kernel.git] / drivers / scsi / sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index b5507d5..5428d53 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1353,6 +1353,7 @@ static const struct file_operations sg_fops = {
        .mmap = sg_mmap,
        .release = sg_release,
        .fasync = sg_fasync,
+       .llseek = no_llseek,
 };
 
 static struct class *sg_sysfs_class;
@@ -1659,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;