1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 78abc1c1f9d5..a50bf65de06e 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);