God, this is the never-ending patch. Another USB joystick detection fix for

 MacOSX/Darwin.  --ryan.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40624

src/joystick/darwin/SDL_sysjoystick.c

@@ -646,9 +646,9 @@ int SDL_SYS_JoystickInit(void)
 //			HIDReportErrorNum ("IOObjectRelease error with ioHIDDeviceObject.", result);
 
 		/* Filter device list to non-keyboard/mouse stuff */ 
-		if ( device->usagePage == kHIDPage_GenericDesktop &&
-		     (device->usage != kHIDUsage_GD_Joystick &&
-		      device->usage != kHIDUsage_GD_GamePad)) {
+		if ( (device->usagePage != kHIDPage_GenericDesktop) ||
+		     ((device->usage != kHIDUsage_GD_Joystick &&
+		      device->usage != kHIDUsage_GD_GamePad)) ) {
 
 			/* release memory for the device */
 			HIDDisposeDevice (&device);