Merged r5547:5548 from branches/SDL-1.2: FreeBSD joystick uninit'd va…

…r fix.
libsdl-org · Feb 5, 2010 · 8ea9878265b632b69649da22b6716432fd708d32 · 8ea9878
1 parent 9df1519
commit 8ea9878265b632b69649da22b6716432fd708d32
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/joystick/bsd/SDL_sysjoystick.c
diff --git 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 */