Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / scsi / hptiop.c

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index a96751cad8cf84e131d886a3232da4093929e2af..ab2f8b26790857e2388564aaa58688df5598c70c 100644 (file)
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -545,7 +545,7 @@ static int hptiop_queuecommand(struct scsi_cmnd *scp,
        req->header.context = cpu_to_le32(IOPMU_QUEUE_ADDR_HOST_BIT |
                                                        (u32)_req->index);
        req->header.context_hi32 = 0;
-       req->dataxfer_length = cpu_to_le32(scp->bufflen);
+       req->dataxfer_length = cpu_to_le32(scp->request_bufflen);
        req->channel = scp->device->channel;
        req->target = scp->device->id;
        req->lun = scp->device->lun;
@@ -1304,7 +1304,7 @@ static int __devinit hptiop_probe(struct pci_dev *pcidev,
 
        pci_set_drvdata(pcidev, host);
 
-       if (request_irq(pcidev->irq, hptiop_intr, SA_SHIRQ,
+       if (request_irq(pcidev->irq, hptiop_intr, IRQF_SHARED,
                                        driver_name, hba)) {
                printk(KERN_ERR "scsi%d: request irq %d failed\n",
                                        hba->host->host_no, pcidev->irq);