---

yaml --- r: 324939 b: refs/heads/master c: 5948ae2 h: refs/heads/master i: 324937: d62ecf3 324935: 5e5a447 v: v3
git-mirror · Sep 7, 2012 · ee638eb · ee638eb
1 parent 5bfd588
commit ee638eb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7953e44cefe1359032d1148de69b966bcd2e5233
+refs/heads/master: 5948ae27fb4f0e87ce8543ca1934599b83929a3e
diff --git a/trunk/drivers/staging/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c
@@ -31,7 +31,8 @@ static inline const struct ipack_device_id *
 ipack_match_one_device(const struct ipack_device_id *id,
 		       const struct ipack_device *device)
 {
-	if ((id->format == IPACK_ANY_ID || id->format == device->id_format) &&
+	if ((id->format == IPACK_ANY_FORMAT ||
+				id->format == device->id_format) &&
 	    (id->vendor == IPACK_ANY_ID || id->vendor == device->id_vendor) &&
 	    (id->device == IPACK_ANY_ID || id->device == device->id_device))
 		return id;

diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h
@@ -600,6 +600,7 @@ struct x86_cpu_id {
 #define X86_MODEL_ANY  0
 #define X86_FEATURE_ANY 0	/* Same as FPU, you can't test for that */
 
+#define IPACK_ANY_FORMAT 0xff
 #define IPACK_ANY_ID (~0)
 struct ipack_device_id {
 	__u8  format;			/* Format version or IPACK_ANY_ID */

diff --git a/trunk/scripts/mod/file2alias.c b/trunk/scripts/mod/file2alias.c
@@ -973,7 +973,7 @@ static int do_ipack_entry(const char *filename,
 	id->vendor = TO_NATIVE(id->vendor);
 	id->device = TO_NATIVE(id->device);
 	strcpy(alias, "ipack:");
-	ADD(alias, "f", id->format != IPACK_ANY_ID, id->format);
+	ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format);
 	ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor);
 	ADD(alias, "d", id->device != IPACK_ANY_ID, id->device);
 	add_wildcard(alias);