---

yaml --- r: 157429 b: refs/heads/master c: 1da73bc h: refs/heads/master i: 157427: d0d8a61 v: v3
git-mirror · Sep 11, 2009 · 3382e74 · 3382e74
1 parent a35ed79
commit 3382e74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62733e5a5a480a893e56fa6133ae90904d857bc4
+refs/heads/master: 1da73bc80bdfc9588192a6e6f5a72f8138f7378d
diff --git a/trunk/drivers/s390/cio/css.c b/trunk/drivers/s390/cio/css.c
@@ -170,6 +170,9 @@ css_subchannel_release(struct device *dev)
 
 	sch = to_subchannel(dev);
 	if (!cio_is_console(sch->schid)) {
+		/* Reset intparm to zeroes. */
+		sch->config.intparm = 0;
+		cio_commit_config(sch);
 		kfree(sch->lock);
 		kfree(sch);
 	}

diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
@@ -1024,9 +1024,6 @@ static void ccw_device_call_sch_unregister(struct work_struct *work)
 		return;
 	sch = to_subchannel(cdev->dev.parent);
 	css_sch_device_unregister(sch);
-	/* Reset intparm to zeroes. */
-	sch->config.intparm = 0;
-	cio_commit_config(sch);
 	/* Release cdev reference for workqueue processing.*/
 	put_device(&cdev->dev);
 	/* Release subchannel reference for local processing. */
@@ -1210,9 +1207,6 @@ static void io_subchannel_do_unreg(struct work_struct *work)
 
 	sch = container_of(work, struct subchannel, work);
 	css_sch_device_unregister(sch);
-	/* Reset intparm to zeroes. */
-	sch->config.intparm = 0;
-	cio_commit_config(sch);
 	put_device(&sch->dev);
 }
 
@@ -1688,10 +1682,6 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
 		spin_unlock_irqrestore(sch->lock, flags);
 		css_sch_device_unregister(sch);
 		spin_lock_irqsave(sch->lock, flags);
-
-		/* Reset intparm to zeroes. */
-		sch->config.intparm = 0;
-		cio_commit_config(sch);
 		break;
 	case REPROBE:
 		ccw_device_trigger_reprobe(cdev);