From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 C9044369217 for ; Wed, 6 May 2026 06:49:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778050150; cv=none; b=WP4XUlJuOftLil7DVhcQpp4gQW3p0AWZycNEj6cxfNOW2Oh/YbUZMIeALx9H5aPCIj+eVDvdw4u0lUFK+TLKGx+vhnkw/0ZnOChtvZvfOT+Tfj0BS9byH2Oguc2M1NEOBEwS7jdRlI2lkLdj2AQO3wQfWeCyd0AIbuCA+OjXQsA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778050150; c=relaxed/simple; bh=/aTZ7FfNJUxGAerV0GyNvRYzlJf90me3mmU4zDgewOs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qMqobYASXI9dO8VMuDIRUCtn01UlxqFfFGSepNqdquU4nGJImT5Ct+PzoVARzexBLFyfsck9oq/zjuR+p2VHhmqsehbHqeyO01ieGfZfOcgU18zXXTAjHteQn9FKNn/tblSpzvfpZ6z299AzuWMHOsEjF9Yc7CQVy3PA5WqK4k4= 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=ioIPtAWd; arc=none smtp.client-ip=209.85.128.48 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="ioIPtAWd" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-48896199cbaso52755465e9.1 for ; Tue, 05 May 2026 23:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778050147; x=1778654947; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qqEpiDmgYxnJFJBZV5oyq8iX4ijdqmclDgeEbjUzvZU=; b=ioIPtAWdgpZO/HahDRHEtmCPXbnoFdJHICYIPBbqRhmIe2dtghDjWcdCcQY95MJ7bd g6MMnSHIx1n7/PZ18GV1YUY6HvyiNrAz63CKKSlxyBFOspkLcJuk4Rloee5eyC1vuZlk TRElA42ngbe+yp8QMptnbUzKqxVFsjIWtKtCHibbolAP90DEDFfj8fHv8QBt72z/RnQp H1t7VcTtTOVxr/hRTVY3wM0E+XGKbvPEnadNHUnjZ00RBw0msSFJ3Mu1nnBh8W6FoT3c KwcbFbUqXRfMkbqEsMzCfNlcSP2XVNMq7BRx+d3eRydGb++jWlJLBP/A2VMuPyeJHjBe 5XjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778050147; x=1778654947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qqEpiDmgYxnJFJBZV5oyq8iX4ijdqmclDgeEbjUzvZU=; b=kc9vMZFDUZQfbAhZ7ecwfL8QKSOjVff55lKVwzpdoK1BrXSLQZKFBJTGgAY72CQv7l G+9VhKGogu+dml0QX1CkQ6HQWdo6eGkDFu+rzd6plmUOYQysjmt9ykEknTkpbO8bGHj9 RVX4mrPvtP0+Kwu/6QCkn+avYv+YgEBTnjNt08D4ZHm3jkaCiIcYWu8PLOGu5rvb9+NP 53xyLeeZZ1HSyn2h3EQBEtgFKP5qe2uZ7IYVfVyA6o2f6zAKUgFNilBAYLorbdf/hBgF uKZienjwZfBU5hQQAsShrUhJ0LMaLB11aNdWGcIhpp+Vdw/UxZmxHF/ibmIUbgRYxqow fLKg== X-Forwarded-Encrypted: i=1; AFNElJ/5yalCBVExRkggiB5EqFNlvJ0VhE7f93cw+oRe00JFkSgl9dGINm5rKGEenuVmXfxvZFBCsiJ4CfDpPeY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2kVSuuBtVA93ez0G1lEbpYiU7jnVbw0o7t10wHDXQ0qzIwTJ6 AkGPczCmHEncGST7O0HJ9qCKRpBXc1ecVbxTi8PCj0d4NKpJN1lUNoZs X-Gm-Gg: AeBDievnzEZ/P7wErteVJpwcvUoLxdQvRIclifl44uUzWiUoN7y3WD/X1/PLYQmm1YN CA7/8k4k3yrJjSXnnG5qVkTEfB1owpUxvGnyHfEL53zWiHDZVtn9wonOubIKFIIVuq4eXWXAQtr C6byxk3nzgqwVKsktQMEYqy7nc0Q8D9bIqRrjfOcSTjdckEJrlIA+SKp7qxPfKRapZso6kLW5hy hru8cPICSIcNf5ztJ+04uC+mG3B9pl/eysi3iSvOdCwhgTLuYIO0o2yK419Kifzb3nplSKybLjo wnnYv8LQUEUripoE0f7ecPiN63fT6lWaY/R/JGvcwiid7eF4J5tYNPry2Kvozjn7B40hbXTX+mO LwV4R2slhCvjYrmpVvEmZN+hLZJJTh5fhBGuHYfgzQc6d/EDVGKoyeSQshQ5Bwz780YoQwDgZut unHWpCOrH048nsDr6Zfxs2E4o= X-Received: by 2002:a05:600c:3e05:b0:488:9ed3:1492 with SMTP id 5b1f17b1804b1-48e51f2a997mr38200825e9.10.1778050147183; Tue, 05 May 2026 23:49:07 -0700 (PDT) Received: from xeon ([188.163.112.56]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53891d62sm38398835e9.1.2026.05.05.23.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 23:49:06 -0700 (PDT) From: Svyatoslav Ryhel To: Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , Mauro Carvalho Chehab , Svyatoslav Ryhel Cc: linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v6 2/6] media: i2c: lm3560: Fix v4l2 subdev registration Date: Wed, 6 May 2026 09:48:43 +0300 Message-ID: <20260506064847.37795-3-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260506064847.37795-1-clamor95@gmail.com> References: <20260506064847.37795-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The existing driver does not call media subdev registration, making it invisible to the media framework. Since the LM3560 supports two independent LEDs, register each LED as a separate media entity. Because registering LEDs before device initialization may cause access attempts before the hardware is ready, lm3560_init_device has been moved before the subdevice initializations. An additional helper, lm3560_subdev_cleanup, was added to release LED0 if the initialization of LED1 fails, and to deregister both LEDs in the remove function. Signed-off-by: Svyatoslav Ryhel --- drivers/media/i2c/lm3560.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c index f4cc844f4e3c..edfb07587cab 100644 --- a/drivers/media/i2c/lm3560.c +++ b/drivers/media/i2c/lm3560.c @@ -364,8 +364,15 @@ static int lm3560_subdev_init(struct lm3560_flash *flash, goto err_out; flash->subdev_led[led_no].entity.function = MEDIA_ENT_F_FLASH; - return rval; + rval = v4l2_async_register_subdev(&flash->subdev_led[led_no]); + if (rval < 0) { + dev_err(flash->dev, "failed to register V4L2 subdev"); + goto error_out_media; + } + return rval; +error_out_media: + media_entity_cleanup(&flash->subdev_led[led_no].entity); err_out: v4l2_ctrl_handler_free(&flash->ctrls_led[led_no]); return rval; @@ -391,6 +398,14 @@ static int lm3560_init_device(struct lm3560_flash *flash) return rval; } +static void lm3560_subdev_cleanup(struct lm3560_flash *flash, + enum lm3560_led_id led_no) +{ + v4l2_async_unregister_subdev(&flash->subdev_led[led_no]); + v4l2_ctrl_handler_free(&flash->ctrls_led[led_no]); + media_entity_cleanup(&flash->subdev_led[led_no].entity); +} + static int lm3560_probe(struct i2c_client *client) { struct lm3560_flash *flash; @@ -425,17 +440,19 @@ static int lm3560_probe(struct i2c_client *client) flash->dev = &client->dev; mutex_init(&flash->lock); - rval = lm3560_subdev_init(flash, LM3560_LED0, "lm3560-led0"); + rval = lm3560_init_device(flash); if (rval < 0) return rval; - rval = lm3560_subdev_init(flash, LM3560_LED1, "lm3560-led1"); + rval = lm3560_subdev_init(flash, LM3560_LED0, "lm3560-led0"); if (rval < 0) return rval; - rval = lm3560_init_device(flash); - if (rval < 0) + rval = lm3560_subdev_init(flash, LM3560_LED1, "lm3560-led1"); + if (rval < 0) { + lm3560_subdev_cleanup(flash, LM3560_LED0); return rval; + } i2c_set_clientdata(client, flash); @@ -447,11 +464,8 @@ static void lm3560_remove(struct i2c_client *client) struct lm3560_flash *flash = i2c_get_clientdata(client); unsigned int i; - for (i = LM3560_LED0; i < LM3560_LED_MAX; i++) { - v4l2_device_unregister_subdev(&flash->subdev_led[i]); - v4l2_ctrl_handler_free(&flash->ctrls_led[i]); - media_entity_cleanup(&flash->subdev_led[i].entity); - } + for (i = LM3560_LED0; i < LM3560_LED_MAX; i++) + lm3560_subdev_cleanup(flash, i); } static const struct i2c_device_id lm3560_id_table[] = { -- 2.51.0