Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202117
b: refs/heads/master
c: c4dc692
h: refs/heads/master
i:
  202115: 1d5ad39
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Aug 2, 2010
1 parent 89d5d1d commit d0c2658
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 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: a4f96eb2b1d3e0013da7b82b3d3ccd361c3b46b9
refs/heads/master: c4dc692ce6212f4513c39dfcde725aab438a2940
10 changes: 3 additions & 7 deletions trunk/drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,

buffer_len = le16_to_cpu(ep->wMaxPacketSize);
interval = ep->bInterval;
PDEBUG(D_PROBE, "found int in endpoint: 0x%x, "
PDEBUG(D_CONF, "found int in endpoint: 0x%x, "
"buffer_len=%u, interval=%u",
ep->bEndpointAddress, buffer_len, interval);

Expand All @@ -226,7 +226,7 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
gspca_dev->int_urb = urb;
ret = usb_submit_urb(urb, GFP_KERNEL);
if (ret < 0) {
PDEBUG(D_ERR, "submit URB failed with error %i", ret);
PDEBUG(D_ERR, "submit int URB failed with error %i", ret);
goto error_submit;
}
return ret;
Expand Down Expand Up @@ -2216,12 +2216,8 @@ int gspca_dev_probe(struct usb_interface *intf,

/* the USB video interface must be the first one */
if (dev->config->desc.bNumInterfaces != 1
&& intf->cur_altsetting->desc.bInterfaceNumber != 0) {
PDEBUG(D_ERR, "%04x:%04x bad interface %d",
id->idVendor, id->idProduct,
intf->cur_altsetting->desc.bInterfaceNumber);
&& intf->cur_altsetting->desc.bInterfaceNumber != 0)
return -ENODEV;
}

return gspca_dev_probe2(intf, id, sd_desc, dev_size, module);
}
Expand Down

0 comments on commit d0c2658

Please sign in to comment.