mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
media: atmel: atmel-isc: fix INIT_WORK misplacement
commit79199002db
upstream. In case the completion function failes, unbind will be called which will call cancel_work for awb_work. This will trigger a WARN message from the workqueue. To avoid this, move the INIT_WORK call at the start of the completion function. This way the work is always initialized, which corresponds to the 'always canceled' unbind code. Fixes:93d4a26c3d
("[media] atmel-isc: add the isc pipeline function") Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2c4575f070
commit
b6a10a40a4
1 changed files with 2 additions and 2 deletions
|
@ -1555,6 +1555,8 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
|
|||
struct vb2_queue *q = &isc->vb2_vidq;
|
||||
int ret;
|
||||
|
||||
INIT_WORK(&isc->awb_work, isc_awb_work);
|
||||
|
||||
ret = v4l2_device_register_subdev_nodes(&isc->v4l2_dev);
|
||||
if (ret < 0) {
|
||||
v4l2_err(&isc->v4l2_dev, "Failed to register subdev nodes\n");
|
||||
|
@ -1614,8 +1616,6 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
|
|||
return ret;
|
||||
}
|
||||
|
||||
INIT_WORK(&isc->awb_work, isc_awb_work);
|
||||
|
||||
/* Register video device */
|
||||
strlcpy(vdev->name, ATMEL_ISC_NAME, sizeof(vdev->name));
|
||||
vdev->release = video_device_release_empty;
|
||||
|
|
Loading…
Reference in a new issue