[PATCH] s390: fix match in ccw modalias
authorBastian Blank <bastian@waldi.eu.org>
Mon, 6 Mar 2006 23:43:00 +0000 (15:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Mar 2006 02:40:45 +0000 (18:40 -0800)
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>
scripts/mod/file2alias.c

index be97caf664bbf47bc6e7ff5e98cf5f6b297f2e62..c164b230ad6fbe2518e873ee143ed9655df137f0 100644 (file)
@@ -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;
 }