From 9cd9925cc93f2bc61f1941db13cce24c9c6d28ef Mon Sep 17 00:00:00 2001
From: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date: Tue, 16 Feb 2016 20:32:22 +0100
Subject: [PATCH] Android: Changed an internal joystick function to return
 count instead of id.

The returned value is currently not used by the caller. The instance id would
also not be needed on Java side and providing it just complicated the function.

Partially fixes Bugzilla #3234.
---
 src/joystick/android/SDL_sysjoystick.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c
index 8656a5322d2ae..6ef16a93b32b5 100644
--- a/src/joystick/android/SDL_sysjoystick.c
+++ b/src/joystick/android/SDL_sysjoystick.c
@@ -340,7 +340,6 @@ Android_RemoveJoystick(int device_id)
         return -1;
     }
 
-    const int retval = item->device_instance;
     if (item->joystick) {
         item->joystick->hwdata = NULL;
     }
@@ -376,7 +375,7 @@ Android_RemoveJoystick(int device_id)
     
     SDL_free(item->name);
     SDL_free(item);
-    return retval;
+    return numjoysticks;
 }