From 89567dae5d0be43ba12bf6fad415aefd58a75c86 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 28 Jul 2020 12:42:33 +0200
Subject: [PATCH] (input hid) Change back to original code

---
 input/common/hid/device_ds3.c      | 7 +++----
 input/common/hid/device_wiiu_gca.c | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/input/common/hid/device_ds3.c b/input/common/hid/device_ds3.c
index 23fb1da089..199dcb44c9 100644
--- a/input/common/hid/device_ds3.c
+++ b/input/common/hid/device_ds3.c
@@ -330,10 +330,9 @@ static const char *ds3_get_name(void *data) { return "Sony DualShock 3"; }
 static int16_t ds3_button(void *data, uint16_t joykey)
 {
    ds3_instance_t *pad = (ds3_instance_t *)data;
-   if (joykey < 31)
-      if (pad)
-         return (pad->buttons & (1 << joykey));
-   return 0;
+   if (!pad || joykey > 31)
+      return 0;
+   return pad->buttons & (1 << joykey);
 }
 
 pad_connection_interface_t ds3_pad_connection = {
diff --git a/input/common/hid/device_wiiu_gca.c b/input/common/hid/device_wiiu_gca.c
index dab22852de..83b7a75c44 100644
--- a/input/common/hid/device_wiiu_gca.c
+++ b/input/common/hid/device_wiiu_gca.c
@@ -328,10 +328,9 @@ static const char *wiiu_gca_get_name(void *data)
 static int16_t wiiu_gca_button(void *data, uint16_t joykey)
 {
    gca_pad_t *pad = (gca_pad_t *)data;
-   if (joykey < 31)
-      if (pad)
-         return pad->buttons & (1 << joykey);
-   return 0;
+   if(!pad || joykey > 31)
+      return 0;
+   return pad->buttons & (1 << joykey);
 }
 
 pad_connection_interface_t wiiu_gca_pad_connection = {