From: Dan Carpenter <dan.carpen...@oracle.com>

Smatch complains that these should probably be bitwise ORs instead of
logical.  It doesn't matter for "prox" but it makes a difference for
"strip1" and "strip2".

Fixes: c7f0522a1ad1 ('HID: wacom: Slim down wacom_intuos_pad processing')
Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
Reviewed-by: Jason Gerecke <jason.gere...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[jason.gere...@wacom.com: Imported into input-wacom repository (8f9cfdd)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom ad81095]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
 2.6.38/wacom_wac.c | 8 ++++----
 3.7/wacom_wac.c    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index c358778..800085d 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -494,12 +494,12 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
                                  ((data[6] & 0x0F) << 4)  |
                                  (data[5] & 0x0F);
                }
-               strip1 = (data[1] << 8) || data[2];
-               strip2 = (data[3] << 8) || data[4];
+               strip1 = (data[1] << 8) | data[2];
+               strip2 = (data[3] << 8) | data[4];
        }
 
-       prox = (buttons & ~(~0 << nbuttons)) || (keys & ~(~0 << nkeys)) ||
-              (ring1 & 0x80) || (ring2 & 0x80) || strip1 || strip2;
+       prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
+              (ring1 & 0x80) | (ring2 & 0x80) | strip1 | strip2;
 
        wacom_report_numbered_buttons(input, nbuttons, buttons);
 
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index 35b2dbf..0d3cd60 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -494,12 +494,12 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
                                  ((data[6] & 0x0F) << 4)  |
                                  (data[5] & 0x0F);
                }
-               strip1 = (data[1] << 8) || data[2];
-               strip2 = (data[3] << 8) || data[4];
+               strip1 = (data[1] << 8) | data[2];
+               strip2 = (data[3] << 8) | data[4];
        }
 
-       prox = (buttons & ~(~0 << nbuttons)) || (keys & ~(~0 << nkeys)) ||
-              (ring1 & 0x80) || (ring2 & 0x80) || strip1 || strip2;
+       prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
+              (ring1 & 0x80) | (ring2 & 0x80) | strip1 | strip2;
 
        wacom_report_numbered_buttons(input, nbuttons, buttons);
 
-- 
2.7.1


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to