From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>
Subject: [PATCH v1 1/6] leds: spi-byte: call of_node_put() on error path
Date: Thu, 6 Jun 2024 20:29:18 +0300 [thread overview]
Message-ID: <20240606173037.3091598-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20240606173037.3091598-1-andriy.shevchenko@linux.intel.com>
Add a missing call to of_node_put(np) on error.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/leds/leds-spi-byte.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c
index 96296db5f410..b04cf502e603 100644
--- a/drivers/leds/leds-spi-byte.c
+++ b/drivers/leds/leds-spi-byte.c
@@ -91,7 +91,6 @@ static int spi_byte_probe(struct spi_device *spi)
dev_err(dev, "Device must have exactly one LED sub-node.");
return -EINVAL;
}
- child = of_get_next_available_child(dev_of_node(dev), NULL);
led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
if (!led)
@@ -104,11 +103,13 @@ static int spi_byte_probe(struct spi_device *spi)
led->ldev.max_brightness = led->cdef->max_value - led->cdef->off_value;
led->ldev.brightness_set_blocking = spi_byte_brightness_set_blocking;
+ child = of_get_next_available_child(dev_of_node(dev), NULL);
state = of_get_property(child, "default-state", NULL);
if (state) {
if (!strcmp(state, "on")) {
led->ldev.brightness = led->ldev.max_brightness;
} else if (strcmp(state, "off")) {
+ of_node_put(child);
/* all other cases except "off" */
dev_err(dev, "default-state can only be 'on' or 'off'");
return -EINVAL;
@@ -123,9 +124,12 @@ static int spi_byte_probe(struct spi_device *spi)
ret = devm_led_classdev_register_ext(&spi->dev, &led->ldev, &init_data);
if (ret) {
+ of_node_put(child);
mutex_destroy(&led->mutex);
return ret;
}
+
+ of_node_put(child);
spi_set_drvdata(spi, led);
return 0;
--
2.43.0.rc1.1336.g36b5255a03ac
next prev parent reply other threads:[~2024-06-06 17:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 17:29 [PATCH v1 0/6] leds: spi-byte: Cleanup, fix a leak, and make it agnostic Andy Shevchenko
2024-06-06 17:29 ` Andy Shevchenko [this message]
2024-06-06 17:54 ` [PATCH v1 1/6] leds: spi-byte: call of_node_put() on error path Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 2/6] leds: spi-byte: Get rid of custom led_init_default_state_get() Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 3/6] leds: spi-byte: Make use of device properties Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 4/6] leds: spi-byte: Utilise temporary variable for struct device Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 5/6] leds: spi-byte: Use devm_mutex_init() for mutex initialization Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 6/6] leds: spi-byte: Move OF ID table closer to their user Andy Shevchenko
2024-06-13 16:05 ` [PATCH v1 0/6] leds: spi-byte: Cleanup, fix a leak, and make it agnostic Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240606173037.3091598-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®