diff mbox

[SRU,Xenial,1/1] Input: xpad - move pending clear to the correct location

Message ID ba8a0d432b6d1905bb44d23a9445a9f042132722.1467408365.git.joseph.salisbury@canonical.com
State New
Headers show

Commit Message

Joseph Salisbury July 1, 2016, 9:32 p.m. UTC 
From: Pavel Rojtberg <rojtberg@gmail.com>

BugLink: http://bugs.launchpad.net/bugs/1574102

otherwise we lose ff commands: https://github.com/paroj/xpad/issues/27

Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
(cherry picked from commit 4efc6939a83c54fb3417541be48991afd0290ba3)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 drivers/input/joystick/xpad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tim Gardner July 5, 2016, 1:34 p.m. UTC | #1 
I would point out that this commit was Cc'd stable.
diff mbox

Patch

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 620f21d..9923f39 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -718,6 +718,7 @@  static bool xpad_prepare_next_out_packet(struct usb_xpad *xpad)
 	if (packet) {
 		memcpy(xpad->odata, packet->data, packet->len);
 		xpad->irq_out->transfer_buffer_length = packet->len;
+		packet->pending = false;
 		return true;
 	}
 
@@ -757,7 +758,6 @@  static void xpad_irq_out(struct urb *urb)
 	switch (status) {
 	case 0:
 		/* success */
-		xpad->out_packets[xpad->last_out_packet].pending = false;
 		xpad->irq_out_active = xpad_prepare_next_out_packet(xpad);
 		break;