Skip to content

Commit edf0227

Browse files
committed
Merge tag 'gpio-fixes-for-v6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - fix an uninitialized variable in GPIO swnode code - add a missing return value check for devm_mutex_init() - fix an old issue with debugfs output * tag 'gpio-fixes-for-v6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpiolib: fix debugfs dangling chip separator gpiolib: fix debugfs newline separators gpio: sloppy-logic-analyzer: Check for error code from devm_mutex_init() call gpio: fix uninit-value in swnode_find_gpio
2 parents a031e15 + 604888f commit edf0227

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

drivers/gpio/gpio-sloppy-logic-analyzer.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ static int gpio_la_poll_probe(struct platform_device *pdev)
234234
if (!priv)
235235
return -ENOMEM;
236236

237-
devm_mutex_init(dev, &priv->blob_lock);
237+
ret = devm_mutex_init(dev, &priv->blob_lock);
238+
if (ret)
239+
return ret;
238240

239241
fops_buf_size_set(priv, GPIO_LA_DEFAULT_BUF_SIZE);
240242

drivers/gpio/gpiolib-swnode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct gpio_desc *swnode_find_gpio(struct fwnode_handle *fwnode,
6464
struct fwnode_reference_args args;
6565
struct gpio_desc *desc;
6666
char propname[32]; /* 32 is max size of property name */
67-
int ret;
67+
int ret = 0;
6868

6969
swnode = to_software_node(fwnode);
7070
if (!swnode)

drivers/gpio/gpiolib.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4926,6 +4926,8 @@ static void *gpiolib_seq_start(struct seq_file *s, loff_t *pos)
49264926
return NULL;
49274927

49284928
s->private = priv;
4929+
if (*pos > 0)
4930+
priv->newline = true;
49294931
priv->idx = srcu_read_lock(&gpio_devices_srcu);
49304932

49314933
list_for_each_entry_srcu(gdev, &gpio_devices, list,
@@ -4969,7 +4971,7 @@ static int gpiolib_seq_show(struct seq_file *s, void *v)
49694971

49704972
gc = srcu_dereference(gdev->chip, &gdev->srcu);
49714973
if (!gc) {
4972-
seq_printf(s, "%s%s: (dangling chip)",
4974+
seq_printf(s, "%s%s: (dangling chip)\n",
49734975
priv->newline ? "\n" : "",
49744976
dev_name(&gdev->dev));
49754977
return 0;

0 commit comments

Comments
 (0)