Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp67469ybg; Mon, 27 Jul 2020 23:40:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcxYLZasUNTBOBbbERZs3IMpvB5Ex5pqlq8qta2VeRwohbZMABHHqyH59WpG6jkkjUD7KN X-Received: by 2002:a05:6402:3193:: with SMTP id di19mr8793631edb.98.1595918414345; Mon, 27 Jul 2020 23:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595918414; cv=none; d=google.com; s=arc-20160816; b=g9UU9++DD5DsiAuPtInYN0AkIEMpCHuNeq4SOrMSI3mUU/wz+a5nsczioFj0FUjK2i aeDYrjOg2u7DmcDFEV7jbuW4HpEa+NVd3QGEh0zUSYiG6OftC259fWet3NST5sUpOfhi M+2AxHT2wMg3wc1y0lFJSUfFyEr4fN7ZXyzQQ4S3fZ17JtlcPFzoSCkhbRxM/xMhS/KY Jw6+xjJRfyPm41CTbAuqVIqVtNYRGK7x1vlOq/l66rNQMAOjnNkz/Bk8W6Ekfip0b9nt uXSIY/VLpcdJGg40Gd06GT8sWelbDYjfsA6qF7qWJo/BGMWkb8uULxapTWppTuqywnKB M1+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=WDXIytTCyT7kRrNyoWH+p3ffKvT3zxR0417p2t+OjUA=; b=b4a8C8sC5tHGo98AEyX9f9VjnVrAs8GhGmxG0BEWDnOHQRgx39wFN5hycL78bbcV4B iseD0DrpFFdU8hZk/OfhUmOUr6Xu6J36oQXjlWP0WCgZLDwDSBbNnIU6QdcmUz4Qsles kgjcQNJhqArhdDA5/C3SZMml7n+/6NGCVpsg/ZJVVMI70ybtj/4feWTuCO7c9KpNKvFD Pl3up5+Pwr8HRrwFJj4Kg8LANGxpp+Ta3n5et1VjLUrO4V5LlaxwmmSou3vt/e+Fr0WE 1mv0TVlBf8RJjoHZsCJ5M7KbMmfBJfCUWO8+nlsMNg0leDWWJcjkFu858CruIMqw30hR RsOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=GAqzi9pj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=st.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r9si6605227ejb.103.2020.07.27.23.39.51; Mon, 27 Jul 2020 23:40:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=GAqzi9pj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727909AbgG1Gir (ORCPT + 99 others); Tue, 28 Jul 2020 02:38:47 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:5216 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726802AbgG1Gir (ORCPT ); Tue, 28 Jul 2020 02:38:47 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06S6R63F020671; Tue, 28 Jul 2020 08:38:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=WDXIytTCyT7kRrNyoWH+p3ffKvT3zxR0417p2t+OjUA=; b=GAqzi9pjNwv7+TjE7xEXQKl/RrDJQPjcu8dojxSO1WXzn55Y7Q4C7hYoob2vIUgL63RE dojYHNC7YKASt7huOnbb5UnMXXH0SDf3Px7QBibj+tjlws+fDMQiVyR4fjLEcvPvxvsX YOFCX5yTc7K57jDHZMlsu5EkNU4P09kfBjgUBcklBdokaYs28tjuKtClPdVdEbz6PKTn YLSvOAdhPFpQO9E/RNmo3nf2bLxg+CDaSm4TeQ4kBD+RggCRoy8mUJq81iaUeyBh8FtL 2ldLKwXhMySI27h/hKQO2/vhN2qOV1k7zgUT1nRatQEHAjMgsWTUrG6Bo20uLlQgHxz3 lQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 32g9v9cu7k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jul 2020 08:38:34 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9B41B10002A; Tue, 28 Jul 2020 08:38:33 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag3node3.st.com [10.75.127.9]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 8BD73210F99; Tue, 28 Jul 2020 08:38:33 +0200 (CEST) Received: from localhost (10.75.127.46) by SFHDAG3NODE3.st.com (10.75.127.9) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 28 Jul 2020 08:38:33 +0200 From: Alain Volmat To: , CC: , , , , , , , , Subject: [PATCH 2/2] media: stm32-dcmi: fix probe error path & module remove Date: Tue, 28 Jul 2020 08:37:58 +0200 Message-ID: <1595918278-9724-3-git-send-email-alain.volmat@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595918278-9724-1-git-send-email-alain.volmat@st.com> References: <1595918278-9724-1-git-send-email-alain.volmat@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG6NODE2.st.com (10.75.127.17) To SFHDAG3NODE3.st.com (10.75.127.9) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-07-28_01:2020-07-27,2020-07-28 signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit add missing vb2_queue_release calls with the probe error path and module remove. Missing v4l2_async_notifier_unregister is also added within the probe error path Fixes: 37404f91ef8b ("[media] stm32-dcmi: STM32 DCMI camera interface driver") Signed-off-by: Alain Volmat --- drivers/media/platform/stm32/stm32-dcmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index 5e60d4c6eeeb..57830ee691be 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -2004,7 +2004,7 @@ static int dcmi_probe(struct platform_device *pdev) ret = dcmi_graph_init(dcmi); if (ret < 0) - goto err_media_entity_cleanup; + goto err_vb2_queue_release; /* Reset device */ ret = reset_control_assert(dcmi->rstc); @@ -2030,7 +2030,10 @@ static int dcmi_probe(struct platform_device *pdev) return 0; err_cleanup: + v4l2_async_notifier_unregister(&dcmi->notifier); v4l2_async_notifier_cleanup(&dcmi->notifier); +err_vb2_queue_release: + vb2_queue_release(q); err_media_entity_cleanup: media_entity_cleanup(&dcmi->vdev->entity); err_device_release: @@ -2052,6 +2055,7 @@ static int dcmi_remove(struct platform_device *pdev) v4l2_async_notifier_unregister(&dcmi->notifier); v4l2_async_notifier_cleanup(&dcmi->notifier); + vb2_queue_release(&dcmi->queue); media_entity_cleanup(&dcmi->vdev->entity); v4l2_device_unregister(&dcmi->v4l2_dev); media_device_cleanup(&dcmi->mdev); -- 2.7.4