Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / drivers / s390 / block / dasd_alias.c

diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index e36a114354fc368e2141aae5c080c7f61b674da8..b9ce93e9df89295eb72132fcfc81d0257aaa1723 100644 (file)
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -708,7 +708,7 @@ static int reset_summary_unit_check(struct alias_lcu *lcu,
        struct ccw1 *ccw;
 
        cqr = lcu->rsu_cqr;
-       strncpy((char *) &cqr->magic, "ECKD", 4);
+       memcpy((char *) &cqr->magic, "ECKD", 4);
        ASCEBC((char *) &cqr->magic, 4);
        ccw = cqr->cpaddr;
        ccw->cmd_code = DASD_ECKD_CCW_RSCK;