---

yaml --- r: 306233 b: refs/heads/master c: d1c07ef h: refs/heads/master i: 306231: 0a5d22d v: v3
git-mirror · May 7, 2012 · 9020712 · 9020712
1 parent a9664d3
commit 9020712
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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
@@ -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];