diff options
| author | Ingo Molnar <[email protected]> | 2024-01-08 11:57:28 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2024-01-08 11:57:28 +0000 |
| commit | cdb3033e191fd03da2d7da23b9cd448dfa180a8e (patch) | |
| tree | e863d55e63bea2bc9c18652e0d7291fec5e5cd23 /drivers/gpio/gpiolib-cdev.c | |
| parent | sched/fair: Remove unused 'next_buddy_marked' local variable in check_preempt... (diff) | |
| parent | sched/fair: Fix tg->load when offlining a CPU (diff) | |
| download | kernel-cdb3033e191fd03da2d7da23b9cd448dfa180a8e.tar.gz kernel-cdb3033e191fd03da2d7da23b9cd448dfa180a8e.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up pending v6.7 fixes for the v6.8 merge window
This fix didn't make it upstream in time, pick it up
for the v6.8 merge window.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpio/gpiolib-cdev.c')
| -rw-r--r-- | drivers/gpio/gpiolib-cdev.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 02ffda6c1e51..f713d1ef7746 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -2481,10 +2481,7 @@ static int lineinfo_unwatch(struct gpio_chardev_data *cdev, void __user *ip) return 0; } -/* - * gpio_ioctl() - ioctl handler for the GPIO chardev - */ -static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long gpio_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg) { struct gpio_chardev_data *cdev = file->private_data; struct gpio_device *gdev = cdev->gdev; @@ -2521,6 +2518,17 @@ static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } } +/* + * gpio_ioctl() - ioctl handler for the GPIO chardev + */ +static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + struct gpio_chardev_data *cdev = file->private_data; + + return call_ioctl_locked(file, cmd, arg, cdev->gdev, + gpio_ioctl_unlocked); +} + #ifdef CONFIG_COMPAT static long gpio_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg) |