Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303769
b: refs/heads/master
c: 27c2597
h: refs/heads/master
i:
  303767: c5a744d
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 4, 2012
1 parent b947870 commit add0933
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 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: 871ba51c130d4f2e7d33b8c57e834df701357102
refs/heads/master: 27c2597d455a24507f1d0be6991a0a84b5c1b035
8 changes: 5 additions & 3 deletions trunk/drivers/input/tablet/gtco.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ struct gtco {

struct input_dev *inputdevice; /* input device struct pointer */
struct usb_device *usbdev; /* the usb device for this device */
struct usb_interface *intf; /* the usb interface for this device */
struct urb *urbinfo; /* urb for incoming reports */
dma_addr_t buf_dma; /* dma addr of the data buffer*/
unsigned char * buffer; /* databuffer for reports */
Expand Down Expand Up @@ -200,7 +201,7 @@ struct hid_descriptor
static void parse_hid_report_descriptor(struct gtco *device, char * report,
int length)
{
struct device *ddev = &device->inputdevice->dev;
struct device *ddev = &device->intf->dev;
int x, i = 0;

/* Tag primitive vars */
Expand Down Expand Up @@ -713,7 +714,7 @@ static void gtco_urb_callback(struct urb *urbinfo)
* the rest as 0
*/
val = device->buffer[5] & MASK_BUTTON;
dev_dbg(&inputdev->dev,
dev_dbg(&device->intf->dev,
"======>>>>>>REPORT 1: val 0x%X(%d)\n",
val, val);

Expand Down Expand Up @@ -808,7 +809,7 @@ static void gtco_urb_callback(struct urb *urbinfo)
resubmit:
rc = usb_submit_urb(urbinfo, GFP_ATOMIC);
if (rc != 0)
dev_err(&inputdev->dev,
dev_err(&device->intf->dev,
"usb_submit_urb failed rc=0x%x\n", rc);
}

Expand Down Expand Up @@ -849,6 +850,7 @@ static int gtco_probe(struct usb_interface *usbinterface,

/* Save interface information */
gtco->usbdev = usb_get_dev(interface_to_usbdev(usbinterface));
gtco->intf = usbinterface;

/* Allocate some data for incoming reports */
gtco->buffer = usb_alloc_coherent(gtco->usbdev, REPORT_MAX_SIZE,
Expand Down

0 comments on commit add0933

Please sign in to comment.