From d0c2658faa3826dca71b961bdce2afc6f6eb7fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Wed, 14 Jul 2010 06:26:54 -0300 Subject: [PATCH] --- yaml --- r: 202117 b: refs/heads/master c: c4dc692ce6212f4513c39dfcde725aab438a2940 h: refs/heads/master i: 202115: 1d5ad391234d69b256aac3acd8ed36fa9c2fefdf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gspca.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ede3f2b913ca..4b6d349d20aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4f96eb2b1d3e0013da7b82b3d3ccd361c3b46b9 +refs/heads/master: c4dc692ce6212f4513c39dfcde725aab438a2940 diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c index 98c6bdd14455..29b047942826 100644 --- a/trunk/drivers/media/video/gspca/gspca.c +++ b/trunk/drivers/media/video/gspca/gspca.c @@ -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); @@ -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; @@ -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); }