From aa9247162d2ee7547cabf762a544586631db9b33 Mon Sep 17 00:00:00 2001
From: Horst Hummel <horst.hummel@de.ibm.com>
Date: Mon, 4 Dec 2006 15:40:18 +0100
Subject: [PATCH] --- yaml --- r: 42027 b: refs/heads/master c:
 645c98c8b6c09eae58ac2f97e0ade6ced4d6443f h: refs/heads/master i:   42025:
 e18d3517688cf0699715b32b6c65c9b3f6642ce9   42023:
 ca7e74a8e7c5335e1e3aaebe8edd8e7c3d92a978 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/s390/block/dasd_devmap.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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);