---

yaml --- r: 306321 b: refs/heads/master c: d67a1ad h: refs/heads/master i: 306319: 1e39f71 v: v3
git-mirror · May 14, 2012 · fb81858 · fb81858
1 parent 439195c
commit fb81858
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec9c51442b5a524c137b6f4a54ec109a197a65a
+refs/heads/master: d67a1adaea29da942291145fa3964a453e017274
diff --git a/trunk/drivers/media/video/gspca/stv06xx/stv06xx.c b/trunk/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -542,9 +542,8 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
 
 	PDEBUG(D_PROBE, "Configuring camera");
 
-	sd->desc = sd_desc;
 	sd->bridge = id->driver_info;
-	gspca_dev->sd_desc = &sd->desc;
+	gspca_dev->sd_desc = &sd_desc;
 
 	if (dump_bridge)
 		stv06xx_dump_bridge(sd);

diff --git a/trunk/drivers/media/video/gspca/stv06xx/stv06xx.h b/trunk/drivers/media/video/gspca/stv06xx/stv06xx.h
@@ -92,9 +92,6 @@ struct sd {
 	/* Control handler */
 	struct v4l2_ctrl_handler ctrl_handler;
 
-	/* A pointer to the sd_desc struct */
-	struct sd_desc desc;
-
 	/* Sensor private data */
 	void *sensor_priv;