From: Greg Kroah-Hartman Date: Thu, 29 Nov 2018 10:15:13 +0000 (+0100) Subject: patch refresh for 4.14 X-Git-Tag: v4.19.6~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f353bdf49610a40929d20d76c02883bc097f83ba;p=thirdparty%2Fkernel%2Fstable-queue.git patch refresh for 4.14 --- diff --git a/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch b/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch index d1777a83482..516be8b9dc9 100644 --- a/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch +++ b/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch @@ -19,11 +19,9 @@ Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- - drivers/input/joystick/xpad.c | 3 +++ + drivers/input/joystick/xpad.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c -index 69b44aebaf01..2e52015634f9 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -234,6 +234,7 @@ static const struct xpad_device { @@ -34,7 +32,7 @@ index 69b44aebaf01..2e52015634f9 100644 { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 }, -@@ -533,6 +534,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { +@@ -533,6 +534,8 @@ static const struct xboxone_init_packet XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2), XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1), XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2), @@ -43,6 +41,3 @@ index 69b44aebaf01..2e52015634f9 100644 XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init), XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init), XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init), --- -2.17.1 -