Merged r5547:5548 from branches/SDL-1.2: FreeBSD joystick uninit'd var fix.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 05 Feb 2010 19:23:59 +0000
changeset 3703df65ae8f32e8
parent 3702 6604099437ac
child 3704 9bc9ff36eb8f
Merged r5547:5548 from branches/SDL-1.2: FreeBSD joystick uninit'd var fix.
src/joystick/bsd/SDL_sysjoystick.c
     1.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Mon Feb 01 02:52:19 2010 +0000
     1.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Fri Feb 05 19:23:59 2010 +0000
     1.3 @@ -307,11 +307,11 @@
     1.4                       strerror(errno));
     1.5          goto usberr;
     1.6      }
     1.7 +    rep = &hw->inreport;
     1.8  #if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
     1.9      rep->rid = hid_get_report_id(fd);
    1.10      if (rep->rid < 0) {
    1.11  #else
    1.12 -    rep = &hw->inreport;
    1.13      if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
    1.14  #endif
    1.15          rep->rid = -1;          /* XXX */