Skip to content

Commit ae545c3

Browse files
committed
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
2 parents c8afaa1 + 33f83d1 commit ae545c3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/gpio/gpio-sim.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev)
429429
gc->set_config = gpio_sim_set_config;
430430
gc->to_irq = gpio_sim_to_irq;
431431
gc->free = gpio_sim_free;
432+
gc->can_sleep = true;
432433

433434
ret = devm_gpiochip_add_data(dev, gc, chip);
434435
if (ret)

drivers/gpio/gpio-ws16c48.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/spinlock.h>
1919
#include <linux/types.h>
2020

21-
#define WS16C48_EXTENT 10
21+
#define WS16C48_EXTENT 11
2222
#define MAX_NUM_WS16C48 max_num_isa_dev(WS16C48_EXTENT)
2323

2424
static unsigned int base[MAX_NUM_WS16C48];

0 commit comments

Comments
 (0)