aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ipr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r--drivers/scsi/ipr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index ded854a6dd35..0edfb1fa63ce 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5389,9 +5389,9 @@ static int ipr_ioa_reset_done(struct ipr_cmnd *ipr_cmd)
5389 list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q); 5389 list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
5390 wake_up_all(&ioa_cfg->reset_wait_q); 5390 wake_up_all(&ioa_cfg->reset_wait_q);
5391 5391
5392 spin_unlock_irq(ioa_cfg->host->host_lock); 5392 spin_unlock(ioa_cfg->host->host_lock);
5393 scsi_unblock_requests(ioa_cfg->host); 5393 scsi_unblock_requests(ioa_cfg->host);
5394 spin_lock_irq(ioa_cfg->host->host_lock); 5394 spin_lock(ioa_cfg->host->host_lock);
5395 5395
5396 if (!ioa_cfg->allow_cmds) 5396 if (!ioa_cfg->allow_cmds)
5397 scsi_block_requests(ioa_cfg->host); 5397 scsi_block_requests(ioa_cfg->host);
@@ -7473,7 +7473,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
7473 goto out_scsi_host_put; 7473 goto out_scsi_host_put;
7474 } 7474 }
7475 7475
7476 ipr_regs = ioremap(ipr_regs_pci, pci_resource_len(pdev, 0)); 7476 ipr_regs = pci_ioremap_bar(pdev, 0);
7477 7477
7478 if (!ipr_regs) { 7478 if (!ipr_regs) {
7479 dev_err(&pdev->dev, 7479 dev_err(&pdev->dev,