diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:29:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:29:45 -0700 |
| commit | 7409b7132ca96d01b373541d788e8c5893bec1f3 (patch) | |
| tree | d86063b84bee512ab65515a42cb6653932a4e486 /drivers/media/video/uvc/uvc_entity.c | |
| parent | 0ecdb12a7ae983a012f662373fb3ccc22b920ed8 (diff) | |
| parent | e74d83aad3709a17d68f01481f2b5f240250b1c3 (diff) | |
| download | talos-op-linux-7409b7132ca96d01b373541d788e8c5893bec1f3.tar.gz talos-op-linux-7409b7132ca96d01b373541d788e8c5893bec1f3.zip | |
Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
* 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
[media] omap3isp: Fix build error in ispccdc.c
[media] uvcvideo: Fix crash when linking entities
[media] v4l: Make sure we hold a reference to the v4l2_device before using it
[media] v4l: Fix use-after-free case in v4l2_device_release
[media] uvcvideo: Set alternate setting 0 on resume if the bus has been reset
[media] OMAP_VOUT: Fix build break caused by update_mode removal in DSS2
Diffstat (limited to 'drivers/media/video/uvc/uvc_entity.c')
| -rw-r--r-- | drivers/media/video/uvc/uvc_entity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c index 48fea373c25a..29e239911d0e 100644 --- a/drivers/media/video/uvc/uvc_entity.c +++ b/drivers/media/video/uvc/uvc_entity.c @@ -49,7 +49,7 @@ static int uvc_mc_register_entity(struct uvc_video_chain *chain, if (remote == NULL) return -EINVAL; - source = (UVC_ENTITY_TYPE(remote) != UVC_TT_STREAMING) + source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING) ? (remote->vdev ? &remote->vdev->entity : NULL) : &remote->subdev.entity; if (source == NULL) |
