Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5428
b: refs/heads/master
c: c27a748
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Torokhov committed Jun 30, 2005
1 parent de5c231 commit 34e4104
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: ae87dff7ca2723a2428fb55dd57da1315878eb08
refs/heads/master: c27a748225fe5c7e485ea471178c26e43f9f7fbe
8 changes: 4 additions & 4 deletions trunk/drivers/usb/input/acecad.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ static void usb_acecad_irq(struct urb *urb, struct pt_regs *regs)
if (prox) {
int x = data[1] | (data[2] << 8);
int y = data[3] | (data[4] << 8);
/*Pressure should compute the same way for flair and 302*/
int pressure = data[5] | ((int)data[6] << 8);
/* Pressure should compute the same way for flair and 302 */
int pressure = data[5] | (data[6] << 8);
int touch = data[0] & 0x01;
int stylus = (data[0] & 0x10) >> 4;
int stylus2 = (data[0] & 0x20) >> 5;
Expand All @@ -104,9 +104,9 @@ static void usb_acecad_irq(struct urb *urb, struct pt_regs *regs)
input_sync(dev);

resubmit:
status = usb_submit_urb (urb, GFP_ATOMIC);
status = usb_submit_urb(urb, GFP_ATOMIC);
if (status)
err ("can't resubmit intr, %s-%s/input0, status %d",
err("can't resubmit intr, %s-%s/input0, status %d",
acecad->usbdev->bus->bus_name, acecad->usbdev->devpath, status);
}

Expand Down

0 comments on commit 34e4104

Please sign in to comment.