From 637ae9e6952ef09898bcb8fca55339f904931291 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 13 Dec 2012 22:18:32 -0500 Subject: [PATCH] Corrected device instance value for Linux joysticks. --- src/joystick/linux/SDL_sysjoystick.c | 3 +-- src/joystick/linux/SDL_sysjoystick_c.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index b09cbe95a..992eff671 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -722,7 +722,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index) return -1; } - joystick->instance_id = device_index; + joystick->instance_id = item->device_instance; joystick->hwdata = (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata)); if (joystick->hwdata == NULL) { @@ -732,7 +732,6 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index) } SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); joystick->hwdata->removed = SDL_FALSE; - joystick->hwdata->device_instance = item->device_instance; joystick->hwdata->guid = item->guid; joystick->hwdata->fd = fd; joystick->hwdata->fname = SDL_strdup(item->path); diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h index 90dcfe4de..083cd4fe7 100644 --- a/src/joystick/linux/SDL_sysjoystick_c.h +++ b/src/joystick/linux/SDL_sysjoystick_c.h @@ -25,7 +25,6 @@ struct joystick_hwdata { int fd; - int device_instance; SDL_bool removed; SDL_JoystickGUID guid;