diff options
author | Jens Taprogge <jens.taprogge@taprogge.org> | 2012-09-07 04:29:19 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 11:27:34 -0400 |
commit | 5948ae27fb4f0e87ce8543ca1934599b83929a3e (patch) | |
tree | d7d8e33ddc830a1b969f87d9064550024b1dd957 /scripts/mod/file2alias.c | |
parent | 7953e44cefe1359032d1148de69b966bcd2e5233 (diff) |
staging/ipack: Fix bug introduced by IPack device matching
~0 can not be casted to u8. Instead of using the IPACK_ANY_ID for the format
field we introduce a new IPACK_ANY_FORMAT specifically for that field and
defined as 0xff.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Acked-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/mod/file2alias.c')
-rw-r--r-- | scripts/mod/file2alias.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 3c22bda8fdf3..df4fc23dd836 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -973,7 +973,7 @@ static int do_ipack_entry(const char *filename, | |||
973 | id->vendor = TO_NATIVE(id->vendor); | 973 | id->vendor = TO_NATIVE(id->vendor); |
974 | id->device = TO_NATIVE(id->device); | 974 | id->device = TO_NATIVE(id->device); |
975 | strcpy(alias, "ipack:"); | 975 | strcpy(alias, "ipack:"); |
976 | ADD(alias, "f", id->format != IPACK_ANY_ID, id->format); | 976 | ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format); |
977 | ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor); | 977 | ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor); |
978 | ADD(alias, "d", id->device != IPACK_ANY_ID, id->device); | 978 | ADD(alias, "d", id->device != IPACK_ANY_ID, id->device); |
979 | add_wildcard(alias); | 979 | add_wildcard(alias); |