From patchwork Fri Sep 15 07:28:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 723831 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D230EE6427 for ; Fri, 15 Sep 2023 07:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232482AbjIOH2o (ORCPT ); Fri, 15 Sep 2023 03:28:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232504AbjIOH2m (ORCPT ); Fri, 15 Sep 2023 03:28:42 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C71EA170E for ; Fri, 15 Sep 2023 00:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694762908; x=1726298908; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M2IH4YdYd2P5e2rb5K/gLMgF3fZtlNLUbodHI4h1nhc=; b=IaJR5/RLCbWhZGPR42kHBtgTlhY108ftvqT18e2NlOou/KRgKZlFlNM4 DRPZfktGaQDjcheG8fvWFwlYMjtZa8DYc3DEcuDdLwDFv+gNaBnuxEkHy 96HqAvN74HXm8HVEA3RrvkW7KulFDF/0hHHoPTcJrsCcCL+rOd/H14dYJ zc3FioCOcZBC6iFLWOjGxVTLKiQQwY3aveCzoI2mA0gVtQQtAQ2Yv5G7G dyRF2mZBYhY1S8Bh3Zc2Iy8KFsbi37h4pjcK5zfgCzl++5ZnLGRe4anav bcBwmwFJM1mmpRKu2e9DNDvIcDqMk20Bn/uvnfVHadwBQlz5eK6kUGWGI A==; X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="465548717" X-IronPort-AV: E=Sophos;i="6.02,148,1688454000"; d="scan'208";a="465548717" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 00:28:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="888133113" X-IronPort-AV: E=Sophos;i="6.02,148,1688454000"; d="scan'208";a="888133113" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 00:27:44 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 4DC8F120BB3; Fri, 15 Sep 2023 10:28:15 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Tianshu Qiu , Bingbu Cao , Tomi Valkeinen , Jacopo Mondi Subject: [PATCH 4/7] media: ccs: Correct error handling in ccs_register_subdev Date: Fri, 15 Sep 2023 10:28:06 +0300 Message-Id: <20230915072809.37886-5-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915072809.37886-1-sakari.ailus@linux.intel.com> References: <20230915072809.37886-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org ccs_register_subdev() did not clean up the media entity in error case, do that now. Also switch to goto based error handling. Signed-off-by: Sakari Ailus --- drivers/media/i2c/ccs/ccs-core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c index 6f8fbd82e21c..3fed071b65ab 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -2968,7 +2968,7 @@ static int ccs_register_subdev(struct ccs_sensor *sensor, rval = v4l2_device_register_subdev(sensor->src->sd.v4l2_dev, &ssd->sd); if (rval) { dev_err(&client->dev, "v4l2_device_register_subdev failed\n"); - return rval; + goto out_media_entity_cleanup; } rval = media_create_pad_link(&ssd->sd.entity, source_pad, @@ -2976,11 +2976,18 @@ static int ccs_register_subdev(struct ccs_sensor *sensor, link_flags); if (rval) { dev_err(&client->dev, "media_create_pad_link failed\n"); - v4l2_device_unregister_subdev(&ssd->sd); - return rval; + goto out_v4l2_device_unregister_subdev; } return 0; + +out_v4l2_device_unregister_subdev: + v4l2_device_unregister_subdev(&ssd->sd); + +out_media_entity_cleanup: + media_entity_cleanup(&ssd->sd.entity); + + return rval; } static void ccs_unregistered(struct v4l2_subdev *subdev)