diff options
| author | Ryan C. Gordon <icculus@icculus.org> | 2010-02-05 19:23:59 +0000 |
|---|---|---|
| committer | Ryan C. Gordon <icculus@icculus.org> | 2010-02-05 19:23:59 +0000 |
| commit | 2570f36a05b2493337133c87be5baaab8e43ced4 (patch) | |
| tree | 1d6b3a611867bd0cfbf267334b2f715fe5218bf2 /src/joystick | |
| parent | b4ec792804ccdda4e8dbab019516d5501f250d44 (diff) | |
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
Diffstat (limited to 'src/joystick')
| -rw-r--r-- | src/joystick/bsd/SDL_sysjoystick.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |