---

yaml
---
r: 157439
b: refs/heads/master
c: 3b554a1
h: refs/heads/master
i:
  157437: ee356e3
  157435: 801e98d
  157431: 88e459c
  157423: 64938e8
  157407: 264d8e7
  157375: 288a5c4
  157311: a73562f
  157183: c641daa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee4fec6be06f7d138860b37cba58982cc3ccb16
+refs/heads/master: 3b554a14f4bdf754ba9d2f64c2b6edf8dafe93b9

trunk/drivers/s390/cio/device.c

@@ -307,8 +307,11 @@ int ccw_device_is_orphan(struct ccw_device *cdev)
 
 static void ccw_device_unregister(struct ccw_device *cdev)
 {
-	if (test_and_clear_bit(1, &cdev->private->registered))
+	if (test_and_clear_bit(1, &cdev->private->registered)) {
 		device_del(&cdev->dev);
+		/* Release reference from device_initialize(). */
+		put_device(&cdev->dev);
+	}
 }
 
 static void ccw_device_remove_orphan_cb(struct work_struct *work)
@@ -319,7 +322,6 @@ static void ccw_device_remove_orphan_cb(struct work_struct *work)
 	priv = container_of(work, struct ccw_device_private, kick_work);
 	cdev = priv->cdev;
 	ccw_device_unregister(cdev);
-	put_device(&cdev->dev);
 	/* Release cdev reference for workqueue processing. */
 	put_device(&cdev->dev);
 }
@@ -1358,7 +1360,6 @@ io_subchannel_remove (struct subchannel *sch)
 	cdev->private->state = DEV_STATE_NOT_OPER;
 	spin_unlock_irqrestore(cdev->ccwlock, flags);
 	ccw_device_unregister(cdev);
-	put_device(&cdev->dev);
 	kfree(sch->private);
 	sysfs_remove_group(&sch->dev.kobj, &io_subchannel_attr_group);
 	return 0;