forked from Minki/linux
media: atmel: atmel-isc: fix INIT_WORK misplacement
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>
This commit is contained in:
parent
253ccf3423
commit
79199002db
@ -1999,6 +1999,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");
|
||||
@ -2052,8 +2054,6 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
|
||||
return ret;
|
||||
}
|
||||
|
||||
INIT_WORK(&isc->awb_work, isc_awb_work);
|
||||
|
||||
/* Register video device */
|
||||
strscpy(vdev->name, ATMEL_ISC_NAME, sizeof(vdev->name));
|
||||
vdev->release = video_device_release_empty;
|
||||
|
Loading…
Reference in New Issue
Block a user