diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 20:41:34 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 20:41:34 +0000 |
| commit | 2a2d10f386c1bacabe1a530c06dc8488eac419e5 (patch) | |
| tree | 4606a4a3bafa42a8aa70e001d35883956a0f0589 /drivers/scsi/qla2xxx/qla_mid.c | |
| parent | 2f68ffd11aa76b251921976c982b814df9ebe890 (diff) | |
| parent | c499546f43f2c31b681271ef7db922839fcde5fe (diff) | |
| download | blackbird-op-linux-2a2d10f386c1bacabe1a530c06dc8488eac419e5.tar.gz blackbird-op-linux-2a2d10f386c1bacabe1a530c06dc8488eac419e5.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
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 b901aa267e7d..ff17dee28613 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 */ |
