--- v6
+++ v5
@@ -25,7 +25,7 @@
  	help
  	  Provides support for Sony PS5 controllers including support for
 diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
-index 20fe29fc61c0..a4ef9fae7a36 100644
+index 0c3956756bf0..2da362d3dbda 100644
 --- a/drivers/hid/hid-playstation.c
 +++ b/drivers/hid/hid-playstation.c
 @@ -6,6 +6,7 @@
@@ -51,7 +51,7 @@
  
  #define DS_FEATURE_REPORT_CALIBRATION		0x05
  #define DS_FEATURE_REPORT_CALIBRATION_SIZE	41
-@@ -300,6 +307,17 @@ static int ps_device_register_battery(struct ps_device *dev)
+@@ -292,6 +299,17 @@ static int ps_device_register_battery(struct ps_device *dev)
  	return 0;
  }
  
@@ -69,7 +69,7 @@
  static struct input_dev *ps_gamepad_create(struct hid_device *hdev)
  {
  	struct input_dev *gamepad;
-@@ -351,6 +369,17 @@ static int ps_get_report(struct hid_device *hdev, uint8_t report_id, uint8_t *bu
+@@ -342,6 +360,17 @@ static int ps_get_report(struct hid_device *hdev, uint8_t report_id, uint8_t *bu
  		return -EINVAL;
  	}
  
@@ -87,7 +87,7 @@
  	return 0;
  }
  
-@@ -552,6 +581,17 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r
+@@ -543,6 +572,17 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r
  	if (hdev->bus == BUS_USB && report->id == DS_INPUT_REPORT_USB &&
  			size == DS_INPUT_REPORT_USB_SIZE) {
  		ds_report = (struct dualsense_input_report *)&data[1];
@@ -105,7 +105,7 @@
  	} else {
  		hid_err(hdev, "Unhandled reportID=%d\n", report->id);
  		return -1;
-@@ -815,6 +855,7 @@ static void ps_remove(struct hid_device *hdev)
+@@ -806,6 +846,7 @@ static void ps_remove(struct hid_device *hdev)
  }
  
  static const struct hid_device_id ps_devices[] = {