Commit 4cd90083 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e255759e 8aa0f94b

Documentation/admin-guide/gpio/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ gpio 
    gpio-aggregator

    sysfs

    gpio-mockup

    gpio-sim



.. only::  subproject and html

drivers/gpio/gpio-sim.c

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank, 


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



	if (bank->label)

	if (bank->label && (strlen(bank->label) > 0))

		properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",

							       bank->label);