From 07fc75b8c102301dad26bb5f252dcf351b6d6d0a Mon Sep 17 00:00:00 2001 From: "brking@us.ibm.com" Date: Mon, 2 May 2005 19:50:47 -0500 Subject: [PATCH] --- yaml --- r: 2049 b: refs/heads/master c: 5cbf5eaef7e4430f60844748fd33e22a5fb15167 h: refs/heads/master i: 2047: e10090489848902abd81125507a5aaf6599a5e82 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ea20c0f31c2..edf62ee2db42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 380c3877ae5de888cfb7a59990b9aee5a415295f +refs/heads/master: 5cbf5eaef7e4430f60844748fd33e22a5fb15167 diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index 4ba9e886346d..a3d9cf675681 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -5886,6 +5886,7 @@ static void __ipr_remove(struct pci_dev *pdev) spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); + flush_scheduled_work(); spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); spin_lock(&ipr_driver_lock); @@ -5916,8 +5917,6 @@ static void ipr_remove(struct pci_dev *pdev) ENTER; - ioa_cfg->allow_cmds = 0; - flush_scheduled_work(); ipr_remove_trace_file(&ioa_cfg->host->shost_classdev.kobj, &ipr_trace_attr); ipr_remove_dump_file(&ioa_cfg->host->shost_classdev.kobj,