Skip to content

Commit 4cd9008

Browse files
committed
Merge tag 'gpio-fixes-for-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: "Two fixes for the gpio-simulator: - fix a bug with hogs not being set-up in gpio-sim when user-space sets the chip label to an empty string - include the gpio-sim documentation in the index" * tag 'gpio-fixes-for-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: sim: add doc file to index file gpio: sim: check the label length when setting up device properties
2 parents e255759 + 8aa0f94 commit 4cd9008

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Documentation/admin-guide/gpio/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gpio
1010
gpio-aggregator
1111
sysfs
1212
gpio-mockup
13+
gpio-sim
1314

1415
.. only:: subproject and html
1516

drivers/gpio/gpio-sim.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank,
816816

817817
properties[prop_idx++] = PROPERTY_ENTRY_U32("ngpios", bank->num_lines);
818818

819-
if (bank->label)
819+
if (bank->label && (strlen(bank->label) > 0))
820820
properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",
821821
bank->label);
822822

0 commit comments

Comments
 (0)