diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/usb/input/mtouchusb.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/input/mtouchusb.c')
| -rw-r--r-- | drivers/usb/input/mtouchusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c index a9ccda8810e0..5dce951f2751 100644 --- a/drivers/usb/input/mtouchusb.c +++ b/drivers/usb/input/mtouchusb.c | |||
| @@ -107,7 +107,7 @@ static void mtouchusb_irq(struct urb *urb, struct pt_regs *regs) | |||
| 107 | case 0: | 107 | case 0: |
| 108 | /* success */ | 108 | /* success */ |
| 109 | break; | 109 | break; |
| 110 | case -ETIMEDOUT: | 110 | case -ETIME: |
| 111 | /* this urb is timing out */ | 111 | /* this urb is timing out */ |
| 112 | dbg("%s - urb timed out - was the device unplugged?", | 112 | dbg("%s - urb timed out - was the device unplugged?", |
| 113 | __FUNCTION__); | 113 | __FUNCTION__); |