From fb8185896d8ba7f644685a83661c1cd4247ecd4c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 9 May 2012 11:22:47 -0300 Subject: [PATCH] --- yaml --- r: 306321 b: refs/heads/master c: d67a1adaea29da942291145fa3964a453e017274 h: refs/heads/master i: 306319: 1e39f71fdc2d4c924f59ffd5eca99e266fc36ea3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/stv06xx/stv06xx.c | 3 +-- trunk/drivers/media/video/gspca/stv06xx/stv06xx.h | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0b38847a6e2d..ecded79a49db 100644 --- 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 index 3a8d034421fc..cebd615effeb 100644 --- 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 index b338edcdbe0c..b7cbc6b878d3 100644 --- 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;