diff options
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index bb0b5f5e31a5..139ea0e27fd7 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -2139,7 +2139,7 @@ typedef struct scsi_qla_host { | |||
2139 | mempool_t *srb_mempool; | 2139 | mempool_t *srb_mempool; |
2140 | 2140 | ||
2141 | /* This spinlock is used to protect "io transactions", you must | 2141 | /* This spinlock is used to protect "io transactions", you must |
2142 | * aquire it before doing any IO to the card, eg with RD_REG*() and | 2142 | * acquire it before doing any IO to the card, eg with RD_REG*() and |
2143 | * WRT_REG*() for the duration of your entire commandtransaction. | 2143 | * WRT_REG*() for the duration of your entire commandtransaction. |
2144 | * | 2144 | * |
2145 | * This spinlock is of lower priority than the io request lock. | 2145 | * This spinlock is of lower priority than the io request lock. |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 01fc30c49ad0..ec7ebb6037e6 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -1552,7 +1552,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1552 | host->transportt = qla2xxx_transport_template; | 1552 | host->transportt = qla2xxx_transport_template; |
1553 | 1553 | ||
1554 | ret = request_irq(pdev->irq, ha->isp_ops.intr_handler, | 1554 | ret = request_irq(pdev->irq, ha->isp_ops.intr_handler, |
1555 | SA_INTERRUPT|SA_SHIRQ, QLA2XXX_DRIVER_NAME, ha); | 1555 | IRQF_DISABLED|IRQF_SHARED, QLA2XXX_DRIVER_NAME, ha); |
1556 | if (ret) { | 1556 | if (ret) { |
1557 | qla_printk(KERN_WARNING, ha, | 1557 | qla_printk(KERN_WARNING, ha, |
1558 | "Failed to reserve interrupt %d already in use.\n", | 1558 | "Failed to reserve interrupt %d already in use.\n", |