---

yaml --- r: 151099 b: refs/heads/master c: 93a2759 h: refs/heads/master i: 151097: ca2af42 151095: 0baa2cb v: v3
git-mirror · Jun 16, 2009 · 4ff4abf · 4ff4abf
1 parent f3f78b9
commit 4ff4abf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcbd16d5111258df7c821ec1e4124fe6ffbf3c16
+refs/heads/master: 93a275921daf83e6e4efbafdd82712bcaa93f491
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
@@ -138,6 +138,19 @@ static struct css_device_id io_subchannel_ids[] = {
 };
 MODULE_DEVICE_TABLE(css, io_subchannel_ids);
 
+static int io_subchannel_prepare(struct subchannel *sch)
+{
+	struct ccw_device *cdev;
+	/*
+	 * Don't allow suspend while a ccw device registration
+	 * is still outstanding.
+	 */
+	cdev = sch_get_cdev(sch);
+	if (cdev && !device_is_registered(&cdev->dev))
+		return -EAGAIN;
+	return 0;
+}
+
 static struct css_driver io_subchannel_driver = {
 	.owner = THIS_MODULE,
 	.subchannel_type = io_subchannel_ids,
@@ -148,6 +161,7 @@ static struct css_driver io_subchannel_driver = {
 	.probe = io_subchannel_probe,
 	.remove = io_subchannel_remove,
 	.shutdown = io_subchannel_shutdown,
+	.prepare = io_subchannel_prepare,
 };
 
 struct workqueue_struct *ccw_device_work;