diff --git a/changelog.md b/changelog.md
index 6fcd69e6..054fa41c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,9 @@ when upgrading from a version of rust-sdl2 to another.
 
 ### v0.32.3 (unreleased)
 
+[PR #907](https://github.com/Rust-SDL2/rust-sdl2/pull/907)
+Changed the data type to i32 for the `which` field for the events `ControllerDeviceAdded` and `JoyDeviceAdded`.
+
 [PR #882](https://github.com/Rust-SDL2/rust-sdl2/pull/882)
 Ignore unknown bits in `SDL_Keysym`'s `mod` field (key modifiers) when constructing `Event::KeyDown` and `Event::KeyUp`. Deprecate `sdl2::event::Event::unwrap_keymod`, which had been made public accidentally.
 
diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
index b75f5ae1..021ffa88 100644
--- a/src/sdl2/event.rs
+++ b/src/sdl2/event.rs
@@ -557,7 +557,7 @@ pub enum Event {
     JoyDeviceAdded {
         timestamp: u32,
         /// The newly added joystick's `joystick_index`
-        which: u32
+        which: i32
     },
     JoyDeviceRemoved {
         timestamp: u32,
@@ -589,7 +589,7 @@ pub enum Event {
     ControllerDeviceAdded {
         timestamp: u32,
         /// The newly added controller's `joystick_index`
-        which: u32
+        which: i32
     },
     ControllerDeviceRemoved {
         timestamp: u32,
@@ -1405,7 +1405,7 @@ impl Event {
                 let event = raw.jdevice;
                 Event::JoyDeviceAdded {
                     timestamp: event.timestamp,
-                    which: event.which as u32
+                    which: event.which as i32
                 }
             }
             EventType::JoyDeviceRemoved => {
@@ -1451,7 +1451,7 @@ impl Event {
                 let event = raw.cdevice;
                 Event::ControllerDeviceAdded {
                     timestamp: event.timestamp,
-                    which: event.which as u32
+                    which: event.which as i32
                 }
             }
             EventType::ControllerDeviceRemoved => {