On Fri, 5 Nov 2010 23:08:12 +0100
Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx> wrote:
> From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= <moinejf@xxxxxxx>
>
> commit f43402fa55bf5e7e190c176343015122f694857c upstream.
>
> When audio is present, some alternate settings were skipped.
> This prevented some webcams to work, especially when bulk transfer was used.
> This patch permits to use the last or only alternate setting.
>
> Reported-by: Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx>
> Tested-by: Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> ---
>
> This is to be applied to 2.6.36 only, as the regression was introduced there.
> I don't know how many distributors are shipping 2.6.36 and how urgent this can
> be, but FYI without this change video capture on the Playstation Eye (gspca
> ov534 driver) does not work at all.
>
> Regards,
> Antonio
Ping.
I can't see see this either in stable-queue or linux-2.6.36.y
Thanks,
Antonio
> drivers/media/video/gspca/gspca.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
> index 0fb48c0..c64299d 100644
> --- a/drivers/media/video/gspca/gspca.c
> +++ b/drivers/media/video/gspca/gspca.c
> @@ -652,7 +652,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
> : USB_ENDPOINT_XFER_ISOC;
> i = gspca_dev->alt; /* previous alt setting */
> if (gspca_dev->cam.reverse_alts) {
> - if (gspca_dev->audio)
> + if (gspca_dev->audio && i < gspca_dev->nbalt - 2)
> i++;
> while (++i < gspca_dev->nbalt) {
> ep = alt_xfer(&intf->altsetting[i], xfer);
> @@ -660,7 +660,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
> break;
> }
> } else {
> - if (gspca_dev->audio)
> + if (gspca_dev->audio && i > 1)
> i--;
> while (--i >= 0) {
> ep = alt_xfer(&intf->altsetting[i], xfer);
> --
> 1.7.2.3
>
>
--
Antonio Ospite
http://ao2.it
PGP public key ID: 0x4553B001
A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
Attachment:
pgp2ODY7aYkOF.pgp
Description: PGP signature
