Merge tag 'v3.2' into staging/for_v3.3

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / gspca / gspca.c

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index b044c8a10a1dcf26f007a45869787aaa68d38d46..ca5a2b139d0b739f8d5aa149785d95c60d674a4a 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -983,7 +983,7 @@ retry:
                                ret = -EIO;
                                goto out;
                        }
-                       alt = ep_tb[--alt_idx].alt;
+                       gspca_dev->alt = ep_tb[--alt_idx].alt;
                }
        }
 out: