stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: stable@vger.kernel.org
Subject: [PATCH 4.14 08/14] media: atmel: atmel-isc: fix INIT_WORK misplacement
Date: Mon,  2 Dec 2019 10:03:06 +0000	[thread overview]
Message-ID: <20191202100312.1397-8-lee.jones@linaro.org> (raw)
In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org>

From: Eugen Hristev <eugen.hristev@microchip.com>

[ Upstream commit 79199002db5c571e335131856b3ff057ffd9f3c0 ]

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>
---
 drivers/media/platform/atmel/atmel-isc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
index 504d1ca0330e..0dea3cf2cb52 100644
--- a/drivers/media/platform/atmel/atmel-isc.c
+++ b/drivers/media/platform/atmel/atmel-isc.c
@@ -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;
-- 
2.24.0


  parent reply	other threads:[~2019-12-02 10:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-02 10:02 [PATCH 4.14 01/14] clk: at91: fix update bit maps on CFG_MOR write Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 02/14] arm: add missing include platform-data/atmel.h Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 03/14] watchdog: sama5d4: fix WDD value to be always set to max Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 04/14] net: macb: Fix SUBNS increment and increase resolution Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 05/14] media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 06/14] net: macb: fix error format in dev_err() Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 07/14] media: atmel: atmel-isc: fix asd memory allocation Lee Jones
2019-12-02 10:03 ` Lee Jones [this message]
2019-12-02 10:03 ` [PATCH 4.14 09/14] mtd: rawnand: atmel: Fix spelling mistake in error message Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 10/14] pwm: Clear chip_data in pwm_put() Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 11/14] net: macb driver, check for SKBTX_HW_TSTAMP Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 12/14] mtd: rawnand: atmel: fix possible object reference leak Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 13/14] mtd: spi-nor: cast to u64 to avoid uint overflows Lee Jones
2019-12-02 10:03 ` [PATCH 4.14 14/14] clk: at91: generated: set audio_pll_allowed in at91_clk_register_generated() Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191202100312.1397-8-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).