From 2570f36a05b2493337133c87be5baaab8e43ced4 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 5 Feb 2010 19:23:59 +0000 Subject: [PATCH] Merged r5547:5548 from branches/SDL-1.2: FreeBSD joystick uninit'd var fix. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404462 --- src/joystick/bsd/SDL_sysjoystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index 91713e64..d2e7e1c2 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -307,11 +307,11 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy) strerror(errno)); goto usberr; } + rep = &hw->inreport; #if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) rep->rid = hid_get_report_id(fd); if (rep->rid < 0) { #else - rep = &hw->inreport; if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) { #endif rep->rid = -1; /* XXX */