summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <bastian@waldi.eu.org>2006-03-07 00:43:00 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-07 03:40:45 +0100
commitde1d9c033f32ce39bf60e25be3b8624225fa9181 (patch)
treeb4aa8fd8dc687db7eb98781089b94f15d830ecc7
parent[PATCH] windfarm license fix (diff)
downloadlinux-de1d9c033f32ce39bf60e25be3b8624225fa9181.tar.xz
linux-de1d9c033f32ce39bf60e25be3b8624225fa9181.zip
[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>
-rw-r--r--scripts/mod/file2alias.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index be97caf664bb..c164b230ad6f 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -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;
}