Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=688897b0d4910e097f34c0e263d649cf2036eb45
Commit:     688897b0d4910e097f34c0e263d649cf2036eb45
Parent:     8d04ddb64c7bf62aec1102fddc5336a68bcaebe9
Author:     Dmitry Torokhov <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 12 01:32:22 2007 -0400
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Thu Apr 12 01:32:22 2007 -0400

    Input: logips2pp - ignore mice reporting model as 0
    
    There are mice reporting to logitech's queries with model
    of 0. Do not claim that these are Logitech mice.
    
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
---
 drivers/input/mouse/logips2pp.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index d3ddea2..74a8ba7 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -338,12 +338,12 @@ int ps2pp_init(struct psmouse *psmouse, int 
set_properties)
        param[1] = 0;
        ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
 
-       if (!param[1])
-               return -1;
-
        model = ((param[0] >> 4) & 0x07) | ((param[0] << 3) & 0x78);
        buttons = param[1];
 
+       if (!model || !buttons)
+               return -1;
+
        if ((model_info = get_model_info(model)) != NULL) {
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to