aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/pac207.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/pac207.c')
-rw-r--r--drivers/media/video/gspca/pac207.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 482ef4a6afc..72a5b89cd59 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -27,8 +27,8 @@
27 27
28#include "gspca.h" 28#include "gspca.h"
29 29
30#define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 2, 15) 30#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 0)
31static const char version[] = "0.2.15"; 31static const char version[] = "2.1.0";
32 32
33MODULE_AUTHOR("Hans de Goede <j.w.r.degoede@hhs.nl>"); 33MODULE_AUTHOR("Hans de Goede <j.w.r.degoede@hhs.nl>");
34MODULE_DESCRIPTION("Pixart PAC207"); 34MODULE_DESCRIPTION("Pixart PAC207");
@@ -297,7 +297,6 @@ static int sd_open(struct gspca_dev *gspca_dev)
297 struct sd *sd = (struct sd *) gspca_dev; 297 struct sd *sd = (struct sd *) gspca_dev;
298 298
299 sd->autogain = 1; 299 sd->autogain = 1;
300
301 return 0; 300 return 0;
302} 301}
303 302
@@ -338,7 +337,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
338 337
339 pac207_write_reg(gspca_dev, 0x13, 0x01); /* Bit 0, auto clear */ 338 pac207_write_reg(gspca_dev, 0x13, 0x01); /* Bit 0, auto clear */
340 pac207_write_reg(gspca_dev, 0x1c, 0x01); /* not documented */ 339 pac207_write_reg(gspca_dev, 0x1c, 0x01); /* not documented */
341 udelay(1000); /* taken from gspca */ 340 msleep(10);
342 pac207_write_reg(gspca_dev, 0x40, 0x01); /* Start ISO pipe */ 341 pac207_write_reg(gspca_dev, 0x40, 0x01); /* Start ISO pipe */
343 342
344 sd->sof_read = 0; 343 sd->sof_read = 0;
@@ -743,8 +742,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
743 PDEBUG(D_STREAM, "Incomplete frame"); 742 PDEBUG(D_STREAM, "Incomplete frame");
744 } 743 }
745 pac207_decode_frame_init(gspca_dev); 744 pac207_decode_frame_init(gspca_dev);
746 gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 745 gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0);
747 0);
748 len -= sof - data; 746 len -= sof - data;
749 data = sof; 747 data = sof;
750 } 748 }