Commit ae545c32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - mark virtual chips exposed by gpio-sim as ones that can sleep
   (callbacks must not be called from interrupt context)

 - fix an off-by-one error in gpio-ws16c48

* tag 'gpio-fixes-for-v6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: ws16c48: Fix off-by-one error in WS16C48 resource region extent
  gpio: sim: mark the GPIO chip as a one that can sleep
parents c8afaa1b 33f83d13

drivers/gpio/gpio-sim.c

+1 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev) 
	gc->set_config = gpio_sim_set_config;

	gc->to_irq = gpio_sim_to_irq;

	gc->free = gpio_sim_free;

	gc->can_sleep = true;



	ret = devm_gpiochip_add_data(dev, gc, chip);

	if (ret)

drivers/gpio/gpio-ws16c48.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/spinlock.h>

#include <linux/types.h>



#define WS16C48_EXTENT 10

#define WS16C48_EXTENT 11

#define MAX_NUM_WS16C48 max_num_isa_dev(WS16C48_EXTENT)



static unsigned int base[MAX_NUM_WS16C48];