From ee638ebe84a793fbb6adc144f5507f8d4d0c69e1 Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Fri, 7 Sep 2012 10:29:19 +0200 Subject: [PATCH] --- yaml --- r: 324939 b: refs/heads/master c: 5948ae27fb4f0e87ce8543ca1934599b83929a3e h: refs/heads/master i: 324937: d62ecf347d6137be8af55478ab11444cfbf7da6b 324935: 5e5a44718951b38673189fba0a989374e19c5d33 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/ipack.c | 3 ++- trunk/include/linux/mod_devicetable.h | 1 + trunk/scripts/mod/file2alias.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5cc4d55b7f19..4243ff349477 100644 --- 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 index b3736c0a1086..659aadcac04d 100644 --- 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 index 999c4c25fbf7..70c6a359b2f4 100644 --- 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 index 3c22bda8fdf3..df4fc23dd836 100644 --- 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);