diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c
index f5a375f398..6caa2abf8d 100644
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@@ -183,9 +183,7 @@ static const char *xinput_joypad_name(unsigned pad)
     * to get a name from the device itself */
    return dinput_joypad.name(pad);
 #else
-   int xuser = pad_index_to_xuser_index(pad);
-
-   if (xuser < 0)
+   if (pad_index_to_xuser_index(pad) < 0)
       return NULL;
 
    /* On platforms without dinput support, no
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 4115311c5c..292f89cba7 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -668,7 +668,9 @@ void input_autoconfigure_connect(
    {
       autoconfig_handle->dir_autoconfig = strdup(dir_autoconfig);
 
-      if (!string_is_empty(autoconfig_handle->driver))
+      /* 'autoconfig_handle->driver' will only be
+       * non-NULL if 'driver' is a non-empty string */
+      if (autoconfig_handle->driver)
       {
          char dir_driver_autoconfig[PATH_MAX_LENGTH];
          dir_driver_autoconfig[0] = '\0';