---

yaml --- r: 137908 b: refs/heads/master c: 92e8c91 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 599b6bd · 599b6bd
1 parent 2a32602
commit 599b6bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5899c75f0252552f3683e9bba2f2680ea69f76b3
+refs/heads/master: 92e8c91bd2a0db4b129baf332344f564bdfca941
diff --git a/trunk/drivers/media/video/gspca/mr97310a.c b/trunk/drivers/media/video/gspca/mr97310a.c
@@ -73,7 +73,7 @@ static int reg_w(struct gspca_dev *gspca_dev, int len)
 
 	rc = usb_bulk_msg(gspca_dev->dev,
 			  usb_sndbulkpipe(gspca_dev->dev, 4),
-			  gspca_dev->usb_buf, len, 0, 500);
+			  gspca_dev->usb_buf, len, NULL, 500);
 	if (rc < 0)
 		PDEBUG(D_ERR, "reg write [%02x] error %d",
 		       gspca_dev->usb_buf[0], rc);

diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
@@ -1023,7 +1023,7 @@ static void mi0360_probe(struct gspca_dev *gspca_dev)
 {
 	struct sd *sd = (struct sd *) gspca_dev;
 	int i, j;
-	u16 val;
+	u16 val = 0;
 	static const u8 probe_tb[][4][8] = {
 	    {					/* mi0360 */
 		{0xb0, 0x5d, 0x07, 0x00, 0x02, 0x00, 0x00, 0x10},

diff --git a/trunk/drivers/media/video/gspca/spca505.c b/trunk/drivers/media/video/gspca/spca505.c
@@ -426,8 +426,8 @@ static const u8 spca505b_open_data_ccd[][3] = {
 	{0x05, 0x00, 0x11},
 	{0x05, 0x00, 0x12},
 	{0x05, 0x6f, 0x00},
-	{0x05, (u8) (initial_brightness >> 6), 0x00},
-	{0x05, (u8) (initial_brightness << 2), 0x01},
+	{0x05, initial_brightness >> 6, 0x00},
+	{0x05, (initial_brightness << 2) & 0xff, 0x01},
 	{0x05, 0x00, 0x02},
 	{0x05, 0x01, 0x03},
 	{0x05, 0x00, 0x04},
@@ -560,8 +560,8 @@ static const u8 spca505b_open_data_ccd[][3] = {
 	{0x06, 0x5f, 0x1f},
 	{0x06, 0x32, 0x20},
 
-	{0x05, (u8) (initial_brightness >> 6), 0x00},
-	{0x05, (u8) (initial_brightness << 2), 0x01},
+	{0x05, initial_brightness >> 6, 0x00},
+	{0x05, (initial_brightness << 2) & 0xff, 0x01},
 	{0x05, 0x06, 0xc1},
 	{0x05, 0x58, 0xc2},
 	{0x05, 0x00, 0xca},