Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59fd7d5f authored by Eugen Hristev's avatar Eugen Hristev Committed by Greg Kroah-Hartman
Browse files

media: atmel: atmel-isc: fix INIT_WORK misplacement 



commit 79199002db5c571e335131856b3ff057ffd9f3c0 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: 93d4a26c ("[media] atmel-isc: add the isc pipeline function")

Signed-off-by: default avatarEugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9656c3d1

drivers/media/platform/atmel/atmel-isc.c

+2 −2
Original line number Diff line number Diff line
@@ -1895,6 +1895,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");
@@ -1948,8 +1950,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;