From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CF2439A4DF for ; Mon, 22 Jun 2026 12:14:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782130480; cv=none; b=i/r1YtwBNAtb7iCQFqg6TwrlVbg12R6BZvKKrZD2Bk+XDyE/98A5OtWTbzW/7zX8aiuD//lB/Q4zZBvrVrce1/9B2w7I5GdFbFXqyfnTW/YT9AbZUCjDbOqHQNjozbqb+wIUN9zMFAWkygNzjZLI5lREgVUMvRIa+U+yRPqxA/w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782130480; c=relaxed/simple; bh=Je4ATXoR4va71A2ZAIetqA9Orlr2fNUDHK1Gq/4Bdgk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Fhe04MIqabP4ltTZw7fKL9hv91dZs2b0ci7Z4YV/1Ts29/u6vkP8GeKhaxEtmPjyMOjOpf6qQmsseV8A4REYIG5WQhi3MQ9U0mqgBlMlZsbqDqjG98FUqSZNajxVvViEl79VKX5sNF2z1YHSdmj5o1U4MrDaw67RQPj7wdnC/rk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YsNT3tok; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YsNT3tok" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-845438a46d4so2188452b3a.3 for ; Mon, 22 Jun 2026 05:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782130477; x=1782735277; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=O5sfJNmc1yKWdZTqu3HegJ66XvBTGvbaI9z9chRhIF0=; b=YsNT3toklcqnrjz20RrfSZL6/5iYNoLG7wJbdlaM9HUPMpsDRifJ+bn7q0cRTeMTyF ieL3++lq8vfJckHuvRNloJWS1nzZYNSjt6m+QZxc/GSVEhplLoWz0YZxAhB21p0SgyKc F0bycQ3O/giPHYhPTLc6++WnlQRmEZv5SrztNLh09lPsS2Fyz3mQpK7O7w4DVquuqsgX vSWxfHld3XDLu+7O8k0DYN0JMPtK+y7q8o3oLLOJaVUaE3YGNaSJ579HihdqEs3i6X4l ZAitQm3r5heFIXo5W1ZS5lo9BuPeizfF4GmXEQ6S7WBgMdFj7T24ybXLGwpIi50sQ41y 79Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782130477; x=1782735277; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=O5sfJNmc1yKWdZTqu3HegJ66XvBTGvbaI9z9chRhIF0=; b=J/kKBV9fd7kRVRr7spq43011/o6XVAuhDT7NsT+Hgrm/WHl0HO3FIojPRunqkQz1xQ u4jjPUp7uF28RR+eoqiKs7i2pAgu9wNPbZvPt5Yl015f5dUAE/pguPRSpcrGQoICU0Rm GI7q0ITs3sYkCnlhabLa3z7hGWQIdDRtaNII36ckswZ4OrzOzaGM86sr1oTd1rr54RPE dDeCMAUqo/i/Sf4I/DC2Az+o3pAQmxlnY/OjBjtkYYCFfiaqb2RKa/L6otsnYCAJhdBn 5gMVXGtGP48iKU9UMNrHE0SKo1o/WSEFhKnVrsE2MV8WN6Z5/eDHsVJqRPaoZ0dVI/lM ZkgQ== X-Forwarded-Encrypted: i=1; AFNElJ9ewEqHo/jxEjejz2n68tPMHDrCP/+O5lK8mrnGGPBODCZ6SyhQjCYjOganL2iCGtqus9gVDpsisd/cvdE=@vger.kernel.org X-Gm-Message-State: AOJu0YzQckbkofeQBvanP2keH3S8BnWptUA+Bq3TgvBbdd7rHeJLv1HU nKNbB1a3PAomfpPBut/C9I9U46XASYeBIK8+1/ED0g8+30VPWzcLkmk= X-Gm-Gg: AfdE7cmS2FX8VUedwBXNr1TYqq3HHh1QmLbR0yDD4kloqdH1v5e1W0QBoLNSX4euy46 lP65CibsS2nEJHUS1nWNbyjfs2ZIohkvK/FTPZvKvduJu+rBXppJwfAM+3dRFa/qRadfvWpsSOe /c7lROOhsPjcPBalJKHUqDmOhVC6VV/bxTb0LzeRw4f7qqutu6tuDI3x9tF5CWlUL/qedzWIsm6 LIJtXTpLpy1Ve6uqxnRlKKmXXrxq9rGbMMVF/MH/yzkN5xaik97v+WmwNUh7WRvBz7XwYmsjLW1 G4gGDjiSyD2FIVfL2ZPOqDJ/o2qrbIn1cOcUsK7SYphgU4kMTdnJNUl5bxQqu26cN0RmFKzOzqF WQcGe1f3jYfYjNWEaoqXPhDp12gkVGyNaUbQsfCGF+qAEcL6sgNczGlukulNZMUgIaTFwGFmmGz knkFhiYUMWXowE+/UpenZKwR0yOsIoIyFrLm3IrGEsoDEH0KjekjdODR8A/kjUgmvH X-Received: by 2002:a05:6a00:94ee:b0:842:2419:6c0b with SMTP id d2e1a72fcca58-845507bac4fmr14675413b3a.10.1782130477449; Mon, 22 Jun 2026 05:14:37 -0700 (PDT) Received: from localhost.localdomain ([14.5.152.27]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84564d8ee89sm7046238b3a.20.2026.06.22.05.14.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jun 2026 05:14:36 -0700 (PDT) From: Myeonghun Pak To: Sakari Ailus , Benjamin Mugnier , Sylvain Petinot , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Myeonghun Pak Subject: [PATCH v3] media: i2c: vd56g3: Clean up subdev state on init failure Date: Mon, 22 Jun 2026 21:14:29 +0900 Message-ID: <20260622121429.47765-1-mhun512@gmail.com> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit vd56g3_subdev_init() calls v4l2_subdev_init_finalize(), which allocates the subdev active state and requires v4l2_subdev_cleanup() to release it. If vd56g3_update_controls() fails after finalize succeeds, the probe error path currently skips v4l2_subdev_cleanup() and returns an error. The driver .remove() callback is not called after a failed probe, so the active state is leaked. Move the control update to vd56g3_probe() after vd56g3_subdev_init() succeeds, and route failures through the existing err_subdev path. This keeps v4l2_subdev_cleanup() in the common vd56g3_subdev_cleanup() helper. Fixes: 87aa97fc3157 ("media: i2c: Add driver for ST VD56G3 camera sensor") Cc: stable@vger.kernel.org Assisted-by: OpenAI:GPT-5.4 Signed-off-by: Myeonghun Pak --- Changes in v3: - Restore the capitalized subject summary. - Route vd56g3_update_controls() failures through the probe-side subdev cleanup path instead of adding a second v4l2_subdev_cleanup() call. - Add the Assisted-by trailer. Changes in v2: - Use a lowercase subject summary. drivers/media/i2c/vd56g3.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/vd56g3.c b/drivers/media/i2c/vd56g3.c index 157acea9e2..39fb14bab5 100644 --- a/drivers/media/i2c/vd56g3.c +++ b/drivers/media/i2c/vd56g3.c @@ -1388,7 +1388,6 @@ static int vd56g3_detect(struct vd56g3 *sensor) static int vd56g3_subdev_init(struct vd56g3 *sensor) { - struct v4l2_subdev_state *state; int ret; /* Init remaining sub device ops */ @@ -1421,15 +1420,6 @@ static int vd56g3_subdev_init(struct vd56g3 *sensor) goto err_ctrls; } - /* Update controls according to the resolution set */ - state = v4l2_subdev_lock_and_get_active_state(&sensor->sd); - ret = vd56g3_update_controls(sensor); - v4l2_subdev_unlock_state(state); - if (ret) { - dev_err(sensor->dev, "Controls update failed: %d\n", ret); - goto err_ctrls; - } - return 0; err_ctrls: @@ -1452,6 +1442,7 @@ static void vd56g3_subdev_cleanup(struct vd56g3 *sensor) static int vd56g3_probe(struct i2c_client *client) { struct device *dev = &client->dev; + struct v4l2_subdev_state *state; struct vd56g3 *sensor; int ret; @@ -1517,6 +1508,15 @@ static int vd56g3_probe(struct i2c_client *client) goto err_power_off; } + /* Update controls according to the resolution set */ + state = v4l2_subdev_lock_and_get_active_state(&sensor->sd); + ret = vd56g3_update_controls(sensor); + v4l2_subdev_unlock_state(state); + if (ret) { + dev_err(sensor->dev, "Controls update failed: %d\n", ret); + goto err_subdev; + } + ret = v4l2_async_register_subdev(&sensor->sd); if (ret) { dev_err(dev, "Async subdev register failed: %d\n", ret); -- 2.50.1