tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 99d4cf76 21b73ffc

options
unified split
Changed files
+9 -6
drivers
gpio
gpiolib-sysfs.c
+9 -6
drivers/gpio/gpiolib-sysfs.c
··· 474 474 goto done; 475 475 476 476 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; 483 480 } 481 + 482 + status = gpiod_export(desc, true); 483 + if (status < 0) 484 + gpiod_free(desc); 485 + else 486 + set_bit(FLAG_SYSFS, &desc->flags); 484 487 485 488 done: 486 489 if (status)