Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271903
b: refs/heads/master
c: 0dd8269
h: refs/heads/master
i:
  271901: aa785ec
  271899: 1eba25b
  271895: b9e2329
  271887: b89d997
  271871: ccf9a98
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Sep 24, 2011
1 parent 6e0a3ff commit ef69bac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ba4a4ba3c170e618f75213fb03fe2deda754195
refs/heads/master: 0dd826962716ff6984a14038d1604be816d759c3
8 changes: 4 additions & 4 deletions trunk/drivers/media/video/gspca/spca1528.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* spca1528 subdriver
*
* Copyright (C) 2010 Jean-Francois Moine (http://moinejf.free.fr)
* Copyright (C) 2010-2011 Jean-Francois Moine (http://moinejf.free.fr)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -351,7 +351,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
reg_wb(gspca_dev, 0x25, 0x0000, 0x0004, mode);
reg_r(gspca_dev, 0x25, 0x0004, 1);
reg_wb(gspca_dev, 0x27, 0x0000, 0x0000, 0x06);
reg_wb(gspca_dev, 0x27, 0x0000, 0x0000, 0x06); /* 420 */
reg_r(gspca_dev, 0x27, 0x0000, 1);
return gspca_dev->usb_err;
}
Expand Down Expand Up @@ -381,7 +381,7 @@ static int sd_start(struct gspca_dev *gspca_dev)

/* start the capture */
wait_status_0(gspca_dev);
reg_w(gspca_dev, 0x31, 0x0000, 0x0004);
reg_w(gspca_dev, 0x31, 0x0000, 0x0004); /* start request */
wait_status_1(gspca_dev);
wait_status_0(gspca_dev);
msleep(200);
Expand All @@ -394,7 +394,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
{
/* stop the capture */
wait_status_0(gspca_dev);
reg_w(gspca_dev, 0x31, 0x0000, 0x0000);
reg_w(gspca_dev, 0x31, 0x0000, 0x0000); /* stop request */
wait_status_1(gspca_dev);
wait_status_0(gspca_dev);
}
Expand Down

0 comments on commit ef69bac

Please sign in to comment.