--- v4
+++ v6
@@ -9,7 +9,7 @@
  1 file changed, 46 insertions(+)
 
 diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
-index ef8da272cf59..483f790aca71 100644
+index b09ec604cd27..20fe29fc61c0 100644
 --- a/drivers/hid/hid-playstation.c
 +++ b/drivers/hid/hid-playstation.c
 @@ -15,10 +15,15 @@
@@ -67,7 +67,7 @@
  static struct input_dev *ps_allocate_input_dev(struct hid_device *hdev, const char *name_suffix)
  {
  	struct input_dev *input_dev;
-@@ -629,6 +666,10 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
+@@ -675,6 +712,10 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
  	}
  	snprintf(hdev->uniq, sizeof(hdev->uniq), "%pMR", ds->base.mac_address);
  
@@ -78,7 +78,7 @@
  	ret = dualsense_get_calibration_data(ds);
  	if (ret) {
  		hid_err(hdev, "Failed to get calibration data from DualSense\n");
-@@ -661,6 +702,7 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
+@@ -707,6 +748,7 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
  	return &ds->base;
  
  err:
@@ -86,7 +86,7 @@
  	return ERR_PTR(ret);
  }
  
-@@ -718,6 +760,10 @@ static int ps_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -764,6 +806,10 @@ static int ps_probe(struct hid_device *hdev, const struct hid_device_id *id)
  
  static void ps_remove(struct hid_device *hdev)
  {