Skip to content

Commit 99d4cf7

Browse files
committed
Merge tag 'gpio-fixes-for-v6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fix from Bartosz Golaszewski: - fix an error path after a failed export in sysfs code * tag 'gpio-fixes-for-v6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpiolib: sysfs: Fix error handling on failed export
2 parents 21b73ff + 95dd1e3 commit 99d4cf7

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

drivers/gpio/gpiolib-sysfs.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,14 +474,17 @@ static ssize_t export_store(const struct class *class,
474474
goto done;
475475

476476
status = gpiod_set_transitory(desc, false);
477-
if (!status) {
478-
status = gpiod_export(desc, true);
479-
if (status < 0)
480-
gpiod_free(desc);
481-
else
482-
set_bit(FLAG_SYSFS, &desc->flags);
477+
if (status) {
478+
gpiod_free(desc);
479+
goto done;
483480
}
484481

482+
status = gpiod_export(desc, true);
483+
if (status < 0)
484+
gpiod_free(desc);
485+
else
486+
set_bit(FLAG_SYSFS, &desc->flags);
487+
485488
done:
486489
if (status)
487490
pr_debug("%s: status %d\n", __func__, status);

0 commit comments

Comments
 (0)