diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 743f3f892f..83b3cb0233 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -433,9 +433,7 @@ static void init_video_input(const input_driver_t *tmp)
    if (!driver->input)
       goto error;
 
-   driver->input_data = input_driver_init();
-
-   if (driver->input_data)
+   if (input_driver_init())
       return;
 
 error:
diff --git a/gfx/video_state_python.c b/gfx/video_state_python.c
index 433e137b01..9bc0aed54c 100644
--- a/gfx/video_state_python.c
+++ b/gfx/video_state_python.c
@@ -102,9 +102,6 @@ static PyObject *py_read_input(PyObject *self, PyObject *args)
    
    (void)self;
 
-   if (!driver->input_data)
-      return PyBool_FromLong(0);
-
    if (!PyArg_ParseTuple(args, "II", &user, &key))
       return NULL;
 
@@ -120,7 +117,6 @@ static PyObject *py_read_analog(PyObject *self, PyObject *args)
 {
    unsigned user, index, id, i;
    int16_t res = 0;
-   driver_t *driver     = driver_get_ptr();
    settings_t *settings = config_get_ptr();
    const struct retro_keybind *py_binds[MAX_USERS];
 
@@ -129,9 +125,6 @@ static PyObject *py_read_analog(PyObject *self, PyObject *args)
 
    (void)self;
 
-   if (!driver->input_data)
-      return PyBool_FromLong(0);
-
    if (!PyArg_ParseTuple(args, "III", &user, &index, &id))
       return NULL;
 
diff --git a/input/input_driver.c b/input/input_driver.c
index 9961bd6c01..a8c254b2be 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -229,13 +229,16 @@ bool input_driver_grab_stdin(void)
    return false;
 }
 
-void *input_driver_init(void)
+bool input_driver_init(void)
 {
    driver_t *driver               = driver_get_ptr();
 
    if (driver && driver->input)
-      return driver->input->init();
-   return NULL;
+      driver->input_data = driver->input->init();
+
+   if (!driver->input_data)
+      return false;
+   return true;
 }
 
 void input_driver_free(void)
diff --git a/input/input_driver.h b/input/input_driver.h
index 6dc2ce61a0..01fb8c8a4f 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -165,7 +165,7 @@ bool input_driver_grab_mouse(bool state);
 
 bool input_driver_grab_stdin(void);
 
-void *input_driver_init(void);
+bool input_driver_init(void);
 
 void input_driver_free(void);