Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303770
b: refs/heads/master
c: ed2b2f2
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 4, 2012
1 parent add0933 commit b56478d
Show file tree
Hide file tree
Showing 2 changed files with 8 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: 27c2597d455a24507f1d0be6991a0a84b5c1b035
refs/heads/master: ed2b2f2db2d52098bdda3877367d59984febdd9f
10 changes: 7 additions & 3 deletions trunk/drivers/input/tablet/kbtab.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ struct kbtab {
dma_addr_t data_dma;
struct input_dev *dev;
struct usb_device *usbdev;
struct usb_interface *intf;
struct urb *irq;
char phys[32];
};
Expand All @@ -53,11 +54,13 @@ static void kbtab_irq(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dev_dbg(&dev->dev, "%s - urb shutting down with status: %d\n",
dev_dbg(&kbtab->intf->dev,
"%s - urb shutting down with status: %d\n",
__func__, urb->status);
return;
default:
dev_dbg(&dev->dev, "%s - nonzero urb status received: %d\n",
dev_dbg(&kbtab->intf->dev,
"%s - nonzero urb status received: %d\n",
__func__, urb->status);
goto exit;
}
Expand All @@ -82,7 +85,7 @@ static void kbtab_irq(struct urb *urb)
exit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
dev_err(&dev->dev,
dev_err(&kbtab->intf->dev,
"%s - usb_submit_urb failed with result %d\n",
__func__, retval);
}
Expand Down Expand Up @@ -134,6 +137,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
goto fail2;

kbtab->usbdev = dev;
kbtab->intf = intf;
kbtab->dev = input_dev;

usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys));
Expand Down

0 comments on commit b56478d

Please sign in to comment.