lkml.org 
[lkml]   [2021]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] iio: core: return ENODEV if ioctl is unknown


Le lun., mai 3 2021 at 17:43:50 +0300, Alexandru Ardelean
<aardelean@deviqon.com> a écrit :
> When the ioctl() mechanism was introduced in IIO core to centralize
> the
> registration of all ioctls in one place via commit 8dedcc3eee3ac
> ("iio:
> core: centralize ioctl() calls to the main chardev"), the return code
> was
> changed from ENODEV to EINVAL, when the ioctl code isn't known.
>
> This was done by accident.
>
> This change reverts back to the old behavior, where if the ioctl()
> code
> isn't known, ENODEV is returned (vs EINVAL).
>
> This was brought into perspective by this patch:
>
> https://lore.kernel.org/linux-iio/20210428150815.136150-1-paul@crapouillou.net/
>
> Fixes: 8dedcc3eee3ac ("iio: core: centralize ioctl() calls to the
> main chardev")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Paul Cercueil <paul@crapouillou.net>
> Cc: Nuno Sa <nuno.sa@analog.com>
> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>

Tested-by: Paul Cercueil <paul@crapouillou.net>

Thanks!
-Paul

> ---
> drivers/iio/industrialio-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c
> b/drivers/iio/industrialio-core.c
> index efb4cf91c9e4..9a3a83211a90 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -1803,7 +1803,6 @@ static long iio_ioctl(struct file *filp,
> unsigned int cmd, unsigned long arg)
> if (!indio_dev->info)
> goto out_unlock;
>
> - ret = -EINVAL;
> list_for_each_entry(h, &iio_dev_opaque->ioctl_handlers, entry) {
> ret = h->ioctl(indio_dev, filp, cmd, arg);
> if (ret != IIO_IOCTL_UNHANDLED)
> @@ -1811,7 +1810,7 @@ static long iio_ioctl(struct file *filp,
> unsigned int cmd, unsigned long arg)
> }
>
> if (ret == IIO_IOCTL_UNHANDLED)
> - ret = -EINVAL;
> + ret = -ENODEV;
>
> out_unlock:
> mutex_unlock(&iio_dev_opaque->info_exist_lock);
> --
> 2.31.1
>


\
 
 \ /
  Last update: 2021-05-04 11:05    [W:0.073 / U:0.692 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site