From c710c903cbaf2a0f4b9bce1477aee247df3e6ae9 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 10 Dec 2008 12:23:20 +1100 Subject: [PATCH] --- yaml --- r: 124675 b: refs/heads/master c: 302378534c8d4403f9a9b2a20f875b6866a27e42 h: refs/heads/master i: 124673: 49c295b58be2a1c56950e59f409fd1e913ddf3c2 124671: 7acf6d8e7086fd7ce4edbe22b91006d20f564c30 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea55e6f2b476..c11d264ff5bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f78badb1ae07e7f8b835ab2ea0b456ed3fc4caf4 +refs/heads/master: 302378534c8d4403f9a9b2a20f875b6866a27e42 diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index ec53c220cb37..0edfb1fa63ce 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -5389,9 +5389,9 @@ static int ipr_ioa_reset_done(struct ipr_cmnd *ipr_cmd) list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q); wake_up_all(&ioa_cfg->reset_wait_q); - spin_unlock_irq(ioa_cfg->host->host_lock); + spin_unlock(ioa_cfg->host->host_lock); scsi_unblock_requests(ioa_cfg->host); - spin_lock_irq(ioa_cfg->host->host_lock); + spin_lock(ioa_cfg->host->host_lock); if (!ioa_cfg->allow_cmds) scsi_block_requests(ioa_cfg->host);