From 9020712b151f0dfdfbfaa2f4c70830f68d5d6902 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 8 Apr 2012 12:59:54 -0300 Subject: [PATCH] --- yaml --- r: 306233 b: refs/heads/master c: d1c07ef1135310940f4f49765f7e385aa847cff5 h: refs/heads/master i: 306231: 0a5d22ddf9d5368614e7da22fe377237a0519bc5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_ctrl.c | 1 - trunk/drivers/media/video/uvc/uvcvideo.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 689ada60c604..9ee3c65ad2f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 805e9b4a06bf874c56e0811e9cca5e25cf465e42 +refs/heads/master: d1c07ef1135310940f4f49765f7e385aa847cff5 diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c index 03212c703330..28363b72ff8a 100644 --- a/trunk/drivers/media/video/uvc/uvc_ctrl.c +++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c @@ -1880,7 +1880,6 @@ static int __uvc_ctrl_add_mapping(struct uvc_device *dev, if (map->set == NULL) map->set = uvc_set_le_value; - map->ctrl = &ctrl->info; list_add_tail(&map->list, &ctrl->info.mappings); uvc_trace(UVC_TRACE_CONTROL, "Adding mapping '%s' to control %pUl/%u.\n", diff --git a/trunk/drivers/media/video/uvc/uvcvideo.h b/trunk/drivers/media/video/uvc/uvcvideo.h index 777bb7505f8d..7c3d082505b7 100644 --- a/trunk/drivers/media/video/uvc/uvcvideo.h +++ b/trunk/drivers/media/video/uvc/uvcvideo.h @@ -157,8 +157,6 @@ struct uvc_control_mapping { struct list_head list; struct list_head ev_subs; - struct uvc_control_info *ctrl; - __u32 id; __u8 name[32]; __u8 entity[16];