From 79f19c372b47eef2ca1ffcd67b019fc89305f0a9 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Thu, 24 Sep 2009 10:23:24 +0200 Subject: [PATCH] --- yaml --- r: 167243 b: refs/heads/master c: f45a54214a0770582af06bb1e807493d1b7268ab h: refs/heads/master i: 167241: 8c9a53e3dad26e574ac474fdf79ab0d944ccd0dd 167239: ea8060c4759091fc4f5301e92b9710c84d59961b v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_aux.c | 1 - trunk/drivers/s390/scsi/zfcp_ccw.c | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 87bc5eed9f93..520d69204f40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f99bd4cbfa50be144aee24905befc1209d90d47 +refs/heads/master: f45a54214a0770582af06bb1e807493d1b7268ab diff --git a/trunk/drivers/s390/scsi/zfcp_aux.c b/trunk/drivers/s390/scsi/zfcp_aux.c index 351d2e711ec5..5dcac24a7a1b 100644 --- a/trunk/drivers/s390/scsi/zfcp_aux.c +++ b/trunk/drivers/s390/scsi/zfcp_aux.c @@ -602,7 +602,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) int retval = 0; unsigned long flags; - cancel_work_sync(&adapter->scan_work); cancel_work_sync(&adapter->stat_work); zfcp_fc_wka_ports_force_offline(adapter->gs); zfcp_adapter_scsi_unregister(adapter); diff --git a/trunk/drivers/s390/scsi/zfcp_ccw.c b/trunk/drivers/s390/scsi/zfcp_ccw.c index 95644b71836e..9fe32f7ec8d2 100644 --- a/trunk/drivers/s390/scsi/zfcp_ccw.c +++ b/trunk/drivers/s390/scsi/zfcp_ccw.c @@ -102,7 +102,11 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device) adapter = dev_get_drvdata(&ccw_device->dev); if (!adapter) goto out; + mutex_unlock(&zfcp_data.config_mutex); + + cancel_work_sync(&adapter->scan_work); + mutex_lock(&zfcp_data.config_mutex); write_lock_irq(&zfcp_data.config_lock); list_for_each_entry_safe(port, p, &adapter->port_list_head, list) { list_for_each_entry_safe(unit, u, &port->unit_list_head, list) {