/[linux-patches]/genpatches-2.6/trunk/2.6.14/1423_15.4_iforce-usb.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1423_15.4_iforce-usb.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 8 months ago) by johnm
File MIME type: text/x-diff
File size: 1732 byte(s)
2.6.14-11, rebase against local tree
1 Re-diffed for 2.6.14.7 by Kerin Millar <kerframil@gmail.com>:
2
3 From stable-bounces@linux.kernel.org Wed Feb 1 21:41:00 2006
4 Date: Thu, 02 Feb 2006 00:09:05 -0500
5 From: Dmitry Torokhov <dtor_core@ameritech.net>
6 To: stable@kernel.org
7 Cc:
8 Subject: Input: iforce - fix detection of USB devices
9
10 Recent conversion to wait_event_interruptible_timeout() caused
11 USB detection routine erroneously report timeouts for perfectly
12 working devices.
13
14 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
15 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
16 ---
17
18 --- linux-2.6.14.7.orig/drivers/input/joystick/iforce/iforce-packets.c 2005-10-27 19:02:08.000000000 -0500
19 +++ linux-2.6.14.7/drivers/input/joystick/iforce/iforce-packets.c 2006-02-06 21:42:22.000000000 -0500
20 @@ -166,9 +166,9 @@ void iforce_process_packet(struct iforce
21 iforce->expect_packet = 0;
22 iforce->ecmd = cmd;
23 memcpy(iforce->edata, data, IFORCE_MAX_LENGTH);
24 - wake_up(&iforce->wait);
25 }
26 #endif
27 + wake_up(&iforce->wait);
28
29 if (!iforce->type) {
30 being_used--;
31 @@ -263,7 +263,7 @@ int iforce_get_id_packet(struct iforce *
32 wait_event_interruptible_timeout(iforce->wait,
33 iforce->ctrl->status != -EINPROGRESS, HZ);
34
35 - if (iforce->ctrl->status != -EINPROGRESS) {
36 + if (iforce->ctrl->status) {
37 usb_unlink_urb(iforce->ctrl);
38 return -1;
39 }
40 --- linux-2.6.14.7.orig/drivers/input/joystick/iforce/iforce-usb.c 2005-10-27 19:02:08.000000000 -0500
41 +++ linux-2.6.14.7/drivers/input/joystick/iforce/iforce-usb.c 2006-02-06 21:42:55.000000000 -0500
42 @@ -95,7 +95,6 @@ static void iforce_usb_irq(struct urb *u
43 goto exit;
44 }
45
46 - wake_up(&iforce->wait);
47 iforce_process_packet(iforce,
48 (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs);
49

  ViewVC Help
Powered by ViewVC 1.1.20