2 files changed, 16 insertions, 16 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index f205b8be2ce4..92a886b0eca4 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2526,7 +2526,7 @@ int alps_detect(struct psmouse *psmouse, bool set_properties)
                 psmouse->vendor = "ALPS";
                 psmouse->name = dummy.flags & ALPS_DUALPOINT ?
                                 "DualPoint TouchPad" : "GlidePoint";
-                psmouse->model = dummy.proto_version << 8;
+                psmouse->model = dummy.proto_version;
         }
         return 0;
 }
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index 66240b47819a..94645bfa2a0d 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -14,13 +14,13 @@
 
 #include <linux/input/mt.h>
 
-#define ALPS_PROTO_V1   1
-#define ALPS_PROTO_V2   2
-#define ALPS_PROTO_V3   3
-#define ALPS_PROTO_V4   4
-#define ALPS_PROTO_V5   5
-#define ALPS_PROTO_V6   6
-#define ALPS_PROTO_V7   7       /* t3btl t4s */
+#define ALPS_PROTO_V1           0x100
+#define ALPS_PROTO_V2           0x200
+#define ALPS_PROTO_V3           0x300
+#define ALPS_PROTO_V4           0x400
+#define ALPS_PROTO_V5           0x500
+#define ALPS_PROTO_V6           0x600
+#define ALPS_PROTO_V7           0x700   /* t3btl t4s */
 
 #define MAX_TOUCHES     2
 
@@ -64,11 +64,11 @@ enum V7_PACKET_ID {
  * lists a number of such touchpads.
  */
 struct alps_model_info {
-        unsigned char signature[3];
-        unsigned char command_mode_resp;
-        unsigned char proto_version;
-        unsigned char byte0, mask0;
-        int flags;
+        u8 signature[3];
+        u8 command_mode_resp;
+        u16 proto_version;
+        u8 byte0, mask0;
+        unsigned int flags;
 };
 
 /**
@@ -166,9 +166,9 @@ struct alps_data {
         /* these are autodetected when the device is identified */
         const struct alps_nibble_commands *nibble_commands;
         int addr_command;
-        unsigned char proto_version;
-        unsigned char byte0, mask0;
-        unsigned char fw_ver[3];
+        u16 proto_version;
+        u8 byte0, mask0;
+        u8 fw_ver[3];
         int flags;
         int x_max;
         int y_max;