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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 C685CC34022 for ; Mon, 17 Feb 2020 20:03:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5EB2206E2 for ; Mon, 17 Feb 2020 20:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729334AbgBQUDm (ORCPT ); Mon, 17 Feb 2020 15:03:42 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:43898 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728254AbgBQUDl (ORCPT ); Mon, 17 Feb 2020 15:03:41 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id E27AF2931EE Subject: Re: [PATCH] media: staging: rkisp1: destroy subdevs' mutexes when unregistering To: Dafna Hirschfeld , linux-media@vger.kernel.org Cc: ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org References: <20200217175113.8216-1-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: Date: Mon, 17 Feb 2020 17:03:34 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: <20200217175113.8216-1-dafna.hirschfeld@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Dafna, On 2/17/20 2:51 PM, Dafna Hirschfeld wrote: > call 'mutex_destroy' on the locks of the subdevices 'isp' and 'resizer' > when unregistering and when failing to register. > > Signed-off-by: Dafna Hirschfeld > --- > This patch is a follow-up patch for the patchset: > 'media: staging: rkisp1: add serialization to the isp and resizer ops' > > drivers/staging/media/rkisp1/rkisp1-isp.c | 5 ++++- > drivers/staging/media/rkisp1/rkisp1-resizer.c | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c > index aa7a842f97f8..36c0251911c9 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-isp.c > +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c > @@ -1051,7 +1051,7 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1, > mutex_init(&isp->ops_lock); > ret = media_entity_pads_init(&sd->entity, RKISP1_ISP_PAD_MAX, pads); > if (ret) > - return ret; > + goto err_destroy_mutex; Could you move the mutex_init() the after the media_entity_pads_init() call? So you won't need to add this label. With this: Acked-by: Helen Koike Thanks Helen > > ret = v4l2_device_register_subdev(v4l2_dev, sd); > if (ret) { > @@ -1064,6 +1064,8 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1, > > err_cleanup_media_entity: > media_entity_cleanup(&sd->entity); > +err_destroy_mutex: > + mutex_destroy(&isp->ops_lock); > > return ret; > } > @@ -1074,6 +1076,7 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1) > > v4l2_device_unregister_subdev(sd); > media_entity_cleanup(&sd->entity); > + mutex_destroy(&rkisp1->isp.ops_lock); > } > > /* ---------------------------------------------------------------------------- > diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c > index 87799fbf0363..0b4385153920 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c > +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c > @@ -695,6 +695,7 @@ static void rkisp1_rsz_unregister(struct rkisp1_resizer *rsz) > { > v4l2_device_unregister_subdev(&rsz->sd); > media_entity_cleanup(&rsz->sd.entity); > + mutex_destroy(&rsz->ops_lock); > } > > static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) > @@ -727,7 +728,7 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) > mutex_init(&rsz->ops_lock); > ret = media_entity_pads_init(&sd->entity, 2, pads); > if (ret) > - return ret; > + goto err_destroy_mutex; > > ret = v4l2_device_register_subdev(&rsz->rkisp1->v4l2_dev, sd); > if (ret) { > @@ -740,6 +741,8 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) > > err_cleanup_media_entity: > media_entity_cleanup(&sd->entity); > +err_destroy_mutex: > + mutex_destroy(&rsz->ops_lock); > > return ret; > } >