UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/ccwgroup: fix an uninitialized return code 

Since commit 0b60f9ead5
"s390: use device_remove_file_self() instead of device_schedule_callback()"
the return code of ccwgroup_ungroup_store is uninitialized. Make
sure the rc is always initialized.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2014-06-13 17:29:11 +02:00 committed by Martin Schwidefsky
parent 9280ddb194
commit 0310c8b582
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/s390/cio/ccwgroup.c
View File

@ -184,7 +184,7 @@ static ssize_t ccwgroup_ungroup_store(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct ccwgroup_device *gdev = to_ccwgroupdev(dev); struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
int rc; int rc = 0;
/* Prevent concurrent online/offline processing and ungrouping. */ /* Prevent concurrent online/offline processing and ungrouping. */
if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0) 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)) if (device_remove_file_self(dev, attr))
ccwgroup_ungroup(gdev); ccwgroup_ungroup(gdev);
else
rc = -ENODEV;
out: out:
if (rc) { 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 rc;
} }
return count; return count;