From d953c2edcce8f71a8ae1223daaaaffbbe7d7cb04 Mon Sep 17 00:00:00 2001
From: Frank Blaschka <frank.blaschka@de.ibm.com>
Date: Thu, 12 Nov 2009 21:46:28 +0000
Subject: [PATCH] --- yaml --- r: 171540 b: refs/heads/master c:
 1e1815be87e45ce512f998ab35e9554c25031f4d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/net/ctcm_main.c | 5 +++++
 trunk/drivers/s390/net/fsm.c       | 1 +
 trunk/drivers/s390/net/fsm.h       | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2da6bc09f97c..c9e49bb6b5f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7c2aecc0747f5c86a1959bce6a7ce8170a556b0
+refs/heads/master: 1e1815be87e45ce512f998ab35e9554c25031f4d
diff --git a/trunk/drivers/s390/net/ctcm_main.c b/trunk/drivers/s390/net/ctcm_main.c
index db054ed1a8cc..ecac3b2e32d4 100644
--- a/trunk/drivers/s390/net/ctcm_main.c
+++ b/trunk/drivers/s390/net/ctcm_main.c
@@ -1720,6 +1720,11 @@ static int ctcm_pm_suspend(struct ccwgroup_device *gdev)
 		return 0;
 	netif_device_detach(priv->channel[READ]->netdev);
 	ctcm_close(priv->channel[READ]->netdev);
+	if (!wait_event_timeout(priv->fsm->wait_q,
+	    fsm_getstate(priv->fsm) == DEV_STATE_STOPPED, CTCM_TIME_5_SEC)) {
+		netif_device_attach(priv->channel[READ]->netdev);
+		return -EBUSY;
+	}
 	ccw_device_set_offline(gdev->cdev[1]);
 	ccw_device_set_offline(gdev->cdev[0]);
 	return 0;
diff --git a/trunk/drivers/s390/net/fsm.c b/trunk/drivers/s390/net/fsm.c
index 2c1db8036b7c..cae48cbc5e96 100644
--- a/trunk/drivers/s390/net/fsm.c
+++ b/trunk/drivers/s390/net/fsm.c
@@ -27,6 +27,7 @@ init_fsm(char *name, const char **state_names, const char **event_names, int nr_
 		return NULL;
 	}
 	strlcpy(this->name, name, sizeof(this->name));
+	init_waitqueue_head(&this->wait_q);
 
 	f = kzalloc(sizeof(fsm), order);
 	if (f == NULL) {
diff --git a/trunk/drivers/s390/net/fsm.h b/trunk/drivers/s390/net/fsm.h
index af679c10f1bd..1e8b235d95b5 100644
--- a/trunk/drivers/s390/net/fsm.h
+++ b/trunk/drivers/s390/net/fsm.h
@@ -66,6 +66,7 @@ typedef struct fsm_instance_t {
 	char name[16];
 	void *userdata;
 	int userint;
+	wait_queue_head_t wait_q;
 #if FSM_DEBUG_HISTORY
 	int         history_index;
 	int         history_size;
@@ -197,6 +198,7 @@ fsm_newstate(fsm_instance *fi, int newstate)
 	printk(KERN_DEBUG "fsm(%s): New state %s\n", fi->name,
 		fi->f->state_names[newstate]);
 #endif
+	wake_up(&fi->wait_q);
 }
 
 /**