1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 040e643746aa..4ec19870447e 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. */
-                        atomic_set(&gdev->onoff, 0);
+                /* Release onoff "lock" when ungrouping failed. */
+                atomic_set(&gdev->onoff, 0);
                 return rc;
         }
         return count;