diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index aacd52e92c..fb14b95359 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -635,10 +635,10 @@ static int16_t dinput_input_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(di->joypad, joypad_info,
-                     port, idx, id, binds[port]);
+            int16_t ret = dinput_pressed_analog(di, binds[port], idx, id);
             if (!ret)
-               ret = dinput_pressed_analog(di, binds[port], idx, id);
+               ret      = input_joypad_analog(di->joypad, joypad_info,
+                     port, idx, id, binds[port]);
             return ret;
          }
          break;
diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c
index ea32436526..44c94ad9db 100644
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -163,10 +163,11 @@ static int16_t linuxraw_input_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(linuxraw->joypad,
-                  joypad_info, port, idx, id, binds[port]);
+            int16_t ret = linuxraw_analog_pressed(
+                  linuxraw, binds[port], idx, id);
             if (!ret)
-               ret = linuxraw_analog_pressed(linuxraw, binds[port], idx, id);
+               ret      = input_joypad_analog(linuxraw->joypad,
+                     joypad_info, port, idx, id, binds[port]);
             return ret;
          }
    }
diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c
index 31c528e7d8..e274048cd1 100644
--- a/input/drivers/rwebinput_input.c
+++ b/input/drivers/rwebinput_input.c
@@ -567,13 +567,13 @@ static int16_t rwebinput_input_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(
-                  rwebinput->joypad, joypad_info, port,
-                     idx, id, binds[port]);
-            if (!ret)
-               ret      = rwebinput_analog_pressed(
+            int16_t ret = rwebinput_analog_pressed(
                   rwebinput, joypad_info, binds[port],
                   idx, id);
+            if (!ret)
+               ret      = input_joypad_analog(
+                     rwebinput->joypad, joypad_info, port,
+                     idx, id, binds[port]);
             return ret;
          }
       case RETRO_DEVICE_KEYBOARD:
diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index 53966518fc..28b106e642 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -236,10 +236,10 @@ static int16_t sdl_input_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(sdl->joypad,
-                        joypad_info, port, idx, id, binds[port]);
+            int16_t ret = sdl_analog_pressed(sdl, binds[port], idx, id);
             if (!ret)
-               ret      = sdl_analog_pressed(sdl, binds[port], idx, id);
+               ret      = input_joypad_analog(sdl->joypad,
+                  joypad_info, port, idx, id, binds[port]);
             return ret;
          }
          break;
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 6345c44076..c671b4af54 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -1050,10 +1050,10 @@ static int16_t udev_input_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(udev->joypad,
-                        joypad_info, port, idx, id, binds[port]);
+            int16_t ret = udev_analog_pressed(binds[port], idx, id);
             if (!ret)
-               ret = udev_analog_pressed(binds[port], idx, id);
+               ret      = input_joypad_analog(udev->joypad,
+                     joypad_info, port, idx, id, binds[port]);
             return ret;
          }
       case RETRO_DEVICE_KEYBOARD:
diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c
index e869b87a88..46a6846e5b 100644
--- a/input/drivers/wayland_input.c
+++ b/input/drivers/wayland_input.c
@@ -335,10 +335,10 @@ static int16_t input_wl_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(
-                  wl->joypad, joypad_info, port, idx, id, binds[port]);
+            int16_t ret = input_wl_analog_pressed(wl, binds[port], idx, id);
             if (!ret)
-               ret = input_wl_analog_pressed(wl, binds[port], idx, id);
+               ret      = input_joypad_analog(
+                     wl->joypad, joypad_info, port, idx, id, binds[port]);
             return ret;
          }
          break;
diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c
index 5a5c7600ee..4043d462b2 100644
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@@ -353,11 +353,11 @@ static int16_t x_input_state(void *data,
       case RETRO_DEVICE_ANALOG:
          if (binds[port])
          {
-            int16_t ret = input_joypad_analog(x11->joypad, joypad_info,
-                  port, idx,
-                  id, binds[port]);
+            int16_t ret = x_pressed_analog(x11, binds[port], idx, id);
             if (!ret)
-               ret = x_pressed_analog(x11, binds[port], idx, id);
+               ret      = input_joypad_analog(x11->joypad, joypad_info,
+                     port, idx,
+                     id, binds[port]);
             return ret;
          }
       case RETRO_DEVICE_KEYBOARD: