[S390] return 'count' for successful execution of dasd_eer_enable.

From: Martin Schwidefsky
Date: Mon Dec 04 2006 - 09:54:13 EST


From: Horst Hummel <horst.hummel@xxxxxxxxxx>

[S390] return 'count' for successful execution of dasd_eer_enable.

Currently the return value of 'dasd_eer_enable' is returned - even if the
function returned '0'. Now return 'count' for successful execution.

Signed-off-by: Horst Hummel <horst.hummel@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
---

drivers/s390/block/dasd_devmap.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff -urpN linux-2.6/drivers/s390/block/dasd_devmap.c linux-2.6-patched/drivers/s390/block/dasd_devmap.c
--- linux-2.6/drivers/s390/block/dasd_devmap.c 2006-12-04 14:50:30.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd_devmap.c 2006-12-04 14:50:44.000000000 +0100
@@ -877,12 +877,13 @@ dasd_eer_store(struct device *dev, struc
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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/