From ef69bac5db3e2fa4720903e696c9a67b92f0b9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Fri, 23 Sep 2011 04:19:03 -0300 Subject: [PATCH] --- yaml --- r: 271903 b: refs/heads/master c: 0dd826962716ff6984a14038d1604be816d759c3 h: refs/heads/master i: 271901: aa785ec80b6a28ade98d5fc3cfee475d1d9b5452 271899: 1eba25bfabd6f2cbf84487e0c6e03bcddcad0fbe 271895: b9e23293727ffcb8fb94fdc223852022c985aaf7 271887: b89d9971c36b88663b924c779c75638f2e81ff62 271871: ccf9a98a8cbbb49efdc583fbae045b244025f890 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/spca1528.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2dff76de8a0e..918fbec27d76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ba4a4ba3c170e618f75213fb03fe2deda754195 +refs/heads/master: 0dd826962716ff6984a14038d1604be816d759c3 diff --git a/trunk/drivers/media/video/gspca/spca1528.c b/trunk/drivers/media/video/gspca/spca1528.c index 565c2f1bdfea..f7c70a2c0778 100644 --- a/trunk/drivers/media/video/gspca/spca1528.c +++ b/trunk/drivers/media/video/gspca/spca1528.c @@ -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 @@ -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; } @@ -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); @@ -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); }