Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[cascardo/linux.git] / tools / iio / iio_utils.c

diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c
index 5eb6793..7a6d61c 100644 (file)
--- a/tools/iio/iio_utils.c
+++ b/tools/iio/iio_utils.c
@@ -121,10 +121,6 @@ int iioutils_get_type(unsigned *is_signed, unsigned *bytes, unsigned *bits_used,
 
        ret = -ENOENT;
        while (ent = readdir(dp), ent)
-               /*
-                * Do we allow devices to override a generic name with
-                * a specific one?
-                */
                if ((strcmp(builtname, ent->d_name) == 0) ||
                    (strcmp(builtname_generic, ent->d_name) == 0)) {
                        ret = asprintf(&filename,
@@ -178,6 +174,13 @@ int iioutils_get_type(unsigned *is_signed, unsigned *bytes, unsigned *bits_used,
                        sysfsfp = 0;
                        free(filename);
                        filename = 0;
+
+                       /*
+                        * Avoid having a more generic entry overwriting
+                        * the settings.
+                        */
+                       if (strcmp(builtname, ent->d_name) == 0)
+                               break;
                }
 
 error_close_sysfsfp: