1 files changed, 11 insertions, 17 deletions
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index dfd7bc681c25..e443b0d0b236 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -184,7 +184,7 @@ static ssize_t ccwgroup_ungroup_store(struct device *dev,
                                      const char *buf, size_t count)
 {
        struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        int rc;
+        int rc = 0;
        /* Prevent concurrent online/offline processing and ungrouping. */
        if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
@@ -196,11 +196,12 @@ static ssize_t ccwgroup_ungroup_store(struct device *dev,
        if (device_remove_file_self(dev, attr))
                ccwgroup_ungroup(gdev);
+        else
+                rc = -ENODEV;
 out:
        if (rc) {
-                if (rc != -EAGAIN)
+                /* Release onoff "lock" when ungrouping failed. */
-                        /* Release onoff "lock" when ungrouping failed. */
+                atomic_set(&gdev->onoff, 0);
-                        atomic_set(&gdev->onoff, 0);
                return rc;
        }
        return count;
@@ -227,6 +228,7 @@ static void ccwgroup_ungroup_workfn(struct work_struct *work)
                container_of(work, struct ccwgroup_device, ungroup_work);
        ccwgroup_ungroup(gdev);
+        put_device(&gdev->dev);
 }
 static void ccwgroup_release(struct device *dev)
@@ -412,8 +414,10 @@ static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
 {
        struct ccwgroup_device *gdev = to_ccwgroupdev(data);
-        if (action == BUS_NOTIFY_UNBIND_DRIVER)
+        if (action == BUS_NOTIFY_UNBIND_DRIVER) {
+                get_device(&gdev->dev);
                schedule_work(&gdev->ungroup_work);
+        }
        return NOTIFY_OK;
 }
@@ -582,11 +586,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
                                         __ccwgroup_match_all))) {
                struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-                mutex_lock(&gdev->reg_mutex);
+                ccwgroup_ungroup(gdev);
-                __ccwgroup_remove_symlinks(gdev);
-                device_unregister(dev);
-                __ccwgroup_remove_cdev_refs(gdev);
-                mutex_unlock(&gdev->reg_mutex);
                put_device(dev);
        }
        driver_unregister(&cdriver->driver);
@@ -633,13 +633,7 @@ void ccwgroup_remove_ccwdev(struct ccw_device *cdev)
        get_device(&gdev->dev);
        spin_unlock_irq(cdev->ccwlock);
        /* Unregister group device. */
-        mutex_lock(&gdev->reg_mutex);
+        ccwgroup_ungroup(gdev);
-        if (device_is_registered(&gdev->dev)) {
-                __ccwgroup_remove_symlinks(gdev);
-                device_unregister(&gdev->dev);
-                __ccwgroup_remove_cdev_refs(gdev);
-        }
-        mutex_unlock(&gdev->reg_mutex);
        /* Release ccwgroup device reference for local processing. */
        put_device(&gdev->dev);
 }