Re: [PATCH] iio: core: move 'indio_dev->info' null check first

Re: [PATCH] iio: core: move 'indio_dev->info' null check first

[Markus Elfring]

> Doesn't fix anything. Just moves this to be the first check, as it's very
> simple and fails the regitration earlier, …

How do you think about to use the word “registration” in the change description?

Regards,
Markus

Re: [PATCH] iio: core: move 'indio_dev->info' null check first

[Ardelean, Alexandru]

On Mon, 2020-04-06 at 21:25 +0200, Markus Elfring wrote:
> [External]
> 
> > Doesn't fix anything. Just moves this to be the first check, as it's very
> > simple and fails the regitration earlier, …
> 
> How do you think about to use the word “registration” in the change
> description?

Will fix.
Thanks

> 
> Regards,
> Markus

[PATCH] iio: core: move 'indio_dev->info' null check first

[Alexandru Ardelean]

Doesn't fix anything. Just moves this to be the first check, as it's very
simple and fails the regitration earlier, instead of potentially
initializing the 'indio_dev->label' and checking for duplicate indexes, and
then failing with this simple-check.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 drivers/iio/industrialio-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 157d95a24faa..56ff24d7a174 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1711,6 +1711,9 @@ int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
 {
 	int ret;
 
+	if (!indio_dev->info)
+		return -EINVAL;
+
 	indio_dev->driver_module = this_mod;
 	/* If the calling driver did not initialize of_node, do it here */
 	if (!indio_dev->dev.of_node && indio_dev->dev.parent)
@@ -1723,9 +1726,6 @@ int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
 	if (ret < 0)
 		return ret;
 
-	if (!indio_dev->info)
-		return -EINVAL;
-
 	/* configure elements for the chrdev */
 	indio_dev->dev.devt = MKDEV(MAJOR(iio_devt), indio_dev->id);
 
-- 
2.17.1