Unverified Commit b1ec5c11 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8095 [sync] PR-7143: media: usbtv: Remove useless locks in usbtv_video_free() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7143 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SOYAO53RFJSHNOQEXQJCFDQYTE4GJVBH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9JS 
 
Link:https://gitee.com/openeuler/kernel/pulls/8095

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 0596e556 822a0143

drivers/media/usb/usbtv/usbtv-video.c

+0 −7
Original line number Diff line number Diff line
@@ -959,15 +959,8 @@ int usbtv_video_init(struct usbtv *usbtv) 


void usbtv_video_free(struct usbtv *usbtv)

{

	mutex_lock(&usbtv->vb2q_lock);

	mutex_lock(&usbtv->v4l2_lock);



	usbtv_stop(usbtv);

	vb2_video_unregister_device(&usbtv->vdev);

	v4l2_device_disconnect(&usbtv->v4l2_dev);



	mutex_unlock(&usbtv->v4l2_lock);

	mutex_unlock(&usbtv->vb2q_lock);



	v4l2_device_put(&usbtv->v4l2_dev);

}