hrev52483 adds 1 changeset to branch 'master'
old head: 9b6198ec5f371bbdb6c3a4deb69d4d74ae0268b7
new head: 586138b6329b6985931251269864521a8d161353
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=586138b6329b+%5E9b6198ec5f37
----------------------------------------------------------------------------
586138b6329b: ps2_reset_mouse: error in checking response logic
Change-Id: Ia4011938cf914b2bc2ba9d5cd595fa0ef66d11dd
Reviewed-on: https://review.haiku-os.org/659
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
[ Peter Kosyh <p.kosyh@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52483
Commit: 586138b6329b6985931251269864521a8d161353
URL: https://git.haiku-os.org/haiku/commit/?id=586138b6329b
Author: Peter Kosyh <p.kosyh@xxxxxxxxx>
Date: Sat Nov 3 10:16:25 2018 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Nov 3 17:04:55 2018 UTC
----------------------------------------------------------------------------
1 file changed, 1 insertion(+), 1 deletion(-)
src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
index 4fa5e55a3a..229f0d736d 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.cpp
@@ -45,7 +45,7 @@ ps2_reset_mouse(ps2_dev* dev)
status = ps2_dev_command(dev, PS2_CMD_RESEND, NULL, 0, data, 2);
}
- if (status == B_OK && data[0] != 0xAA && data[1] != 0x00) {
+ if (status == B_OK && (data[0] != 0xAA || data[1] != 0x00)) {
TRACE("ps2: reset mouse failed, response was: 0x%02x 0x%02x\n",
data[0], data[1]);
status = B_ERROR;
