diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-16 22:09:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 22:09:29 -0800 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /drivers/scsi/qla2xxx/qla_mid.c | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
| download | op-kernel-dev-2bb4646fce8d09916b351d1a62f98db7cec6fc41.zip op-kernel-dev-2bb4646fce8d09916b351d1a62f98db7cec6fc41.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_mid.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mid.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index b901aa2..ff17dee 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c @@ -636,13 +636,15 @@ failed: static void qla_do_work(struct work_struct *work) { + unsigned long flags; struct rsp_que *rsp = container_of(work, struct rsp_que, q_work); struct scsi_qla_host *vha; + struct qla_hw_data *ha = rsp->hw; - spin_lock_irq(&rsp->hw->hardware_lock); - vha = qla25xx_get_host(rsp); + spin_lock_irqsave(&rsp->hw->hardware_lock, flags); + vha = pci_get_drvdata(ha->pdev); qla24xx_process_response_queue(vha, rsp); - spin_unlock_irq(&rsp->hw->hardware_lock); + spin_unlock_irqrestore(&rsp->hw->hardware_lock, flags); } /* create response queue */ |
