mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
iio: iio-utils: use channel modifier scaling if it exists
Now there are channel modifiers with their own scaling those should be used when possible over the generic channel type scaling. Examples are of IIO_TEMP channel having a generic scaling value, and another having IIO_MOD_TEMP_AMBIENT modifier with another scaling value. Previously the first scaling value for a channel type would be applied to all channels of like type in iio_generic_buffer Signed-off-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
9d47964bfd
commit
6356f1b9b7
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user