diff --git a/[refs] b/[refs]
index ab08329b883f..66276a9798b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29145a6c8cda3238049937612365e80b53c3f266
+refs/heads/master: 645c98c8b6c09eae58ac2f97e0ade6ced4d6443f
diff --git a/trunk/drivers/s390/block/dasd_devmap.c b/trunk/drivers/s390/block/dasd_devmap.c
index b5e70c523921..17fdd8c9f740 100644
--- a/trunk/drivers/s390/block/dasd_devmap.c
+++ b/trunk/drivers/s390/block/dasd_devmap.c
@@ -877,12 +877,13 @@ dasd_eer_store(struct device *dev, struct device_attribute *attr,
 	if (((endp + 1) < (buf + count)) || (val > 1))
 		return -EINVAL;
 
-	rc = count;
-	if (val)
+	if (val) {
 		rc = dasd_eer_enable(devmap->device);
-	else
+		if (rc)
+			return rc;
+	} else
 		dasd_eer_disable(devmap->device);
-	return rc;
+	return count;
 }
 
 static DEVICE_ATTR(eer_enabled, 0644, dasd_eer_show, dasd_eer_store);