--- v4
+++ v6
@@ -10,7 +10,7 @@
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
-index 966d1a5aee18..8d827d78fa65 100644
+index 2d96785c397d..973c1fe61e8a 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -9,6 +9,7 @@
@@ -64,7 +64,7 @@
static struct input_dev *ps_allocate_input_dev(struct hid_device *hdev, const char *name_suffix)
{
struct input_dev *input_dev;
-@@ -1144,6 +1167,29 @@ static int dualsense_reset_leds(struct dualsense *ds)
+@@ -1156,6 +1179,29 @@ static int dualsense_reset_leds(struct dualsense *ds)
return 0;
}
@@ -76,7 +76,7 @@
+ * across the LEDs, so e.g. player 1 would be "--x--" with x being 'on'.
+ * Follow a similar mapping here.
+ */
-+ int player_ids[5] = {
++ static const int player_ids[5] = {
+ BIT(2),
+ BIT(3) | BIT(1),
+ BIT(4) | BIT(2) | BIT(0),
@@ -94,7 +94,7 @@
static struct ps_device *dualsense_create(struct hid_device *hdev)
{
struct dualsense *ds;
-@@ -1252,6 +1298,15 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
+@@ -1264,6 +1310,15 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
goto err;
}
@@ -110,7 +110,7 @@
return &ds->base;
err:
-@@ -1316,6 +1371,7 @@ static void ps_remove(struct hid_device *hdev)
+@@ -1328,6 +1383,7 @@ static void ps_remove(struct hid_device *hdev)
struct ps_device *dev = hid_get_drvdata(hdev);
ps_devices_list_remove(dev);
@@ -118,8 +118,8 @@
hid_hw_close(hdev);
hid_hw_stop(hdev);
-@@ -1336,7 +1392,19 @@ static struct hid_driver ps_driver = {
- .raw_event = ps_raw_event,
+@@ -1348,7 +1404,19 @@ static struct hid_driver ps_driver = {
+ .raw_event = ps_raw_event,
};
-module_hid_driver(ps_driver);