aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/pac7302.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2010-01-13 06:30:30 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:47 -0500
commit23a5de202bc385b69eb91a5db36699e9579ec03e (patch)
tree450d07dca6b63992c3d8dc293704a0dd7ede22cb /drivers/media/video/gspca/pac7302.c
parent9919fe891da1bd61fad78a0e1e3c0f21cd127eca (diff)
V4L/DVB: gspca - pac7302/pac7311: Remove the unused page loading
There is only one page to load (page 3 for pac7302 and page 4 for pac7311). Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/pac7302.c')
-rw-r--r--drivers/media/video/gspca/pac7302.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index 9660599f783e..336d97ddf54e 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -301,7 +301,6 @@ static const struct v4l2_pix_format vga_mode[] = {
301}; 301};
302 302
303#define LOAD_PAGE3 255 303#define LOAD_PAGE3 255
304#define LOAD_PAGE4 254
305#define END_OF_SEQUENCE 0 304#define END_OF_SEQUENCE 0
306 305
307/* pac 7302 */ 306/* pac 7302 */
@@ -486,8 +485,7 @@ static int reg_w_page(struct gspca_dev *gspca_dev,
486/* output a variable sequence */ 485/* output a variable sequence */
487static int reg_w_var(struct gspca_dev *gspca_dev, 486static int reg_w_var(struct gspca_dev *gspca_dev,
488 const __u8 *seq, 487 const __u8 *seq,
489 const __u8 *page3, unsigned int page3_len, 488 const __u8 *page3, unsigned int page3_len)
490 const __u8 *page4, unsigned int page4_len)
491{ 489{
492 int index, len; 490 int index, len;
493 int ret = 0; 491 int ret = 0;
@@ -498,9 +496,6 @@ static int reg_w_var(struct gspca_dev *gspca_dev,
498 switch (len) { 496 switch (len) {
499 case END_OF_SEQUENCE: 497 case END_OF_SEQUENCE:
500 return ret; 498 return ret;
501 case LOAD_PAGE4:
502 ret = reg_w_page(gspca_dev, page4, page4_len);
503 break;
504 case LOAD_PAGE3: 499 case LOAD_PAGE3:
505 ret = reg_w_page(gspca_dev, page3, page3_len); 500 ret = reg_w_page(gspca_dev, page3, page3_len);
506 break; 501 break;
@@ -745,8 +740,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
745 sd->sof_read = 0; 740 sd->sof_read = 0;
746 741
747 ret = reg_w_var(gspca_dev, start_7302, 742 ret = reg_w_var(gspca_dev, start_7302,
748 page3_7302, sizeof(page3_7302), 743 page3_7302, sizeof(page3_7302));
749 NULL, 0);
750 if (0 <= ret) 744 if (0 <= ret)
751 ret = setbrightcont(gspca_dev); 745 ret = setbrightcont(gspca_dev);
752 if (0 <= ret) 746 if (0 <= ret)