aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/keyspan_remote.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-04-17 15:35:18 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-17 15:35:18 +0100
commit94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch)
tree2318d487807e9f7393fcd46ef0090a27b4ad7981 /drivers/usb/input/keyspan_remote.c
parentd96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff)
parentc19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff)
downloadkernel_goldelico_gta04-94171db1d2f23c22b6050d210b72db3bb2f0b81e.zip
kernel_goldelico_gta04-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.gz
kernel_goldelico_gta04-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.bz2
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/input/keyspan_remote.c')
-rw-r--r--drivers/usb/input/keyspan_remote.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index b4a051b..3d91197 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -297,6 +297,8 @@ static void keyspan_check_data(struct usb_keyspan *remote, struct pt_regs *regs)
remote->data.bits_left -= 6;
} else {
err("%s - Error in message, invalid toggle.\n", __FUNCTION__);
+ remote->stage = 0;
+ return;
}
keyspan_load_tester(remote, 5);