diff options
Diffstat (limited to 'drivers/media/video/uvc/uvc_ctrl.c')
| -rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index a4db26fa2f5..10c2364f3e8 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -20,7 +20,7 @@  #include <linux/videodev2.h>  #include <linux/vmalloc.h>  #include <linux/wait.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "uvcvideo.h" @@ -1664,8 +1664,8 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,  		return -EINVAL;  	} -	/* Search for the matching (GUID/CS) control in the given device */ -	list_for_each_entry(entity, &dev->entities, list) { +	/* Search for the matching (GUID/CS) control on the current chain */ +	list_for_each_entry(entity, &chain->entities, chain) {  		unsigned int i;  		if (UVC_ENTITY_TYPE(entity) != UVC_VC_EXTENSION_UNIT ||  |