From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FF64C432C0 for ; Tue, 3 Dec 2019 23:00:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6845520656 for ; Tue, 3 Dec 2019 23:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575414044; bh=DRhdq4tKlmHJr0vuYMTzbesd6NfrMf+R5YobvCgV1HM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JMIbN81uUEeAG1uTF6ureJRgn0t6j2ACoe1GukNC1XP8qUrHt2mEcnAGJYP8J5iwC EMR4HHfd4bm8LDa8PX/eNqJD9Q5CSYjuecHxTAXp6u6A4HWFcJa1ecjB/2/9vqVVwe dzdxu6J+bNLoT3q/6onZX0wc9ax2S8FU8MbwwyWs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730644AbfLCXAn (ORCPT ); Tue, 3 Dec 2019 18:00:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:52832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730538AbfLCW5R (ORCPT ); Tue, 3 Dec 2019 17:57:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9EB5420674; Tue, 3 Dec 2019 22:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413837; bh=DRhdq4tKlmHJr0vuYMTzbesd6NfrMf+R5YobvCgV1HM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UCDnDZmTytSzYh5kpwr5o21z/R8W1AUCBzyEq4yTouSuBjLUyFefwN6l9+LjKWE8z 5FEABqtQhy1G7V9iQVImla02yduaPbUR9dcHHsfGdX8ujskfqIkY9pvHwpO2wmywPX yVhq+jTnUrQS0hfJENhb9Ix+JfHE0qjrS6N0atB8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eugen Hristev , Hans Verkuil , Mauro Carvalho Chehab , Lee Jones Subject: [PATCH 4.19 281/321] media: atmel: atmel-isc: fix INIT_WORK misplacement Date: Tue, 3 Dec 2019 23:35:47 +0100 Message-Id: <20191203223441.743360070@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eugen Hristev 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: 93d4a26c3d ("[media] atmel-isc: add the isc pipeline function") Signed-off-by: Eugen Hristev Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/atmel/atmel-isc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/platform/atmel/atmel-isc.c +++ b/drivers/media/platform/atmel/atmel-isc.c @@ -1895,6 +1895,8 @@ static int isc_async_complete(struct v4l 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 v4l 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;