Commit de1d9c03 authored Mar 06, 2006 by Bastian Blank Committed by Linus Torvalds Mar 06, 2006

[PATCH] s390: fix match in ccw modalias



Fix matching of devmodel in modaliases.  It breaks automatic loading of any
dasd module.

Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent cdd440fe

scripts/mod/file2alias.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ static int do_ccw_entry(const char *filename,
		id->cu_model);
		ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
		id->dev_type);
		ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
		ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
		id->dev_model);
		return 1;
		}