Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303671
b: refs/heads/master
c: 3b449fe
h: refs/heads/master
i:
  303669: b0c8c9f
  303667: 628264b
  303663: ca17a6c
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 2, 2012
1 parent df40027 commit a9eaa66
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 388fd2026633acf2a23fcb7918ba24d9d646bcfb
refs/heads/master: 3b449fe5d5585a43f26bda4c3d86b7677d4c80db
10 changes: 5 additions & 5 deletions trunk/drivers/input/misc/keyspan_remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6;
} else {
dev_err(&remote->udev->dev,
dev_err(&remote->input->dev,
"%s - Unknown sequence found in system data.\n",
__func__);
remote->stage = 0;
Expand All @@ -288,7 +288,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6;
} else {
dev_err(&remote->udev->dev,
dev_err(&remote->input->dev,
"%s - Unknown sequence found in button data.\n",
__func__);
remote->stage = 0;
Expand All @@ -306,7 +306,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6;
} else {
dev_err(&remote->udev->dev,
dev_err(&remote->input->dev,
"%s - Error in message, invalid toggle.\n",
__func__);
remote->stage = 0;
Expand All @@ -318,7 +318,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 5;
remote->data.bits_left -= 5;
} else {
dev_err(&remote->udev->dev,
dev_err(&remote->input->dev,
"Bad message received, no stop bit found.\n");
}

Expand Down Expand Up @@ -404,7 +404,7 @@ static void keyspan_irq_recv(struct urb *urb)
resubmit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
dev_err(&dev->udev->dev,
dev_err(&dev->input->dev,
"%s - usb_submit_urb failed with result: %d\n",
__func__, retval);
}
Expand Down

0 comments on commit a9eaa66

Please sign in to comment.