[PATCH] s390 - fix match in ccw modalias

Bastian Blank
2006-03-06T02:00:31Z

[-- Attachment #1.1: Type: text/plain, Size: 302 bytes --]

Hi folks

The attached patch fixes matching of devmodel in modaliases.

Martin: can you please push them through for 2.6.16? It breaks automatic
loading of any dasd module.

Bastian

--
The sight of death frightens them [Earthers].
-- Kras the Klingon, "Friday's Child", stardate 3497.2

[-- Attachment #1.2: diff1 --]
[-- Type: text/plain, Size: 502 bytes --]

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index be97caf..c164b23 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
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;
}

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]