Silence the following warning and ensure that existing comparisons of "<=0"
actually make complete sense.
2.6.36/wacom_wac.c:1217:21: warning: comparison of distinct pointer types lacks
a cast [enabled by default]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.36/wacom_wac.c | 2 +-
2.6.36/wacom_wac.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 4537c9d..539c42e 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -892,7 +892,7 @@ static int wacom_mt_touch(struct wacom_wac *wacom)
}
/* There are at most 5 contacts per packet */
- contacts_to_send = min(5, (int)features->num_contacts_left);
+ contacts_to_send = min(5, features->num_contacts_left);
for (i = 0; i < contacts_to_send; i++) {
id = get_unaligned_le16(&data[k]);
diff --git a/2.6.36/wacom_wac.h b/2.6.36/wacom_wac.h
index 1615f2a..8b98bf9 100644
--- a/2.6.36/wacom_wac.h
+++ b/2.6.36/wacom_wac.h
@@ -130,7 +130,7 @@ struct wacom_features {
unsigned quirks;
unsigned touch_max;
unsigned num_contacts;
- unsigned num_contacts_left;
+ int num_contacts_left;
};
struct wacom_shared {
--
2.10.2
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
