Commit 2b93fe64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull gpio fixes from Bartosz Golaszewski:

 - fix a build error in gpio-vf610

 - fix a null-pointer dereference in the GPIO character device code

* tag 'gpio-fixes-for-v5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: cdev: fix null pointer dereference in linereq_free()
  gpio: vf610: fix compilation error
parents a471da31 c8e27a4a

drivers/gpio/gpio-vf610.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/pinctrl/consumer.h>



#define VF610_GPIO_PER_PORT		32

drivers/gpio/gpiolib-cdev.c

+4 −3
Original line number Diff line number Diff line
@@ -1460,9 +1460,10 @@ static ssize_t linereq_read(struct file *file, 
static void linereq_free(struct linereq *lr)

{

	unsigned int i;

	bool hte;

	bool hte = false;



	for (i = 0; i < lr->num_lines; i++) {

		if (lr->lines[i].desc)

			hte = !!test_bit(FLAG_EVENT_CLOCK_HTE,

					 &lr->lines[i].desc->flags);

		edge_detector_stop(&lr->lines[i], hte);