IIO: 3rd round of fixes for 6.10

core:
 - Trigger check on on whether a device was using own trigger was inverted.
 avago,apds9306
 - Checking wrong variable in an error check.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEbilms4eEBlKRJoGxVIU0mcT0FogFAmaDrRYRHGppYzIzQGtl
 cm5lbC5vcmcACgkQVIU0mcT0Foh+SA//YbATM1ymtZm1jHR+gZqh2GLLYcEe8nae
 KzsP3YjJRBaFIYLcf23NYU8MKJUEmbYI5tsK6wcKPiY7PjuopIqq6eQVrk7GeC4b
 bV9CODJ+uEXvvD+PCQ8hmTHViO8RxnuyJk8ECqjd5S64XSQrhT+kdEUfeX8FzfG6
 n8+GY5mhrc5ng10kvL2k8/A0sr6oQN030kPDITcR0+iYRKUVIDTCIxo1Im9W3VYG
 IhnOjwZI43QEcyJHq5YDyEckAo7JlgLWQVQ6RgXymeS+fmUEpdsd6DWTuAZp90bP
 pw4J93WmZ09+4RAnajD5pOcirDM+R9CFkbhqtVG3pf9phPqqM1UgWAmK6862qrQD
 okgF1AahDdQZ6yK2x7Qnc/onyBZD52lVOCvY6MKsLI+Y5HUMvSGnlN5DhO5R4DDJ
 TXOLFxAljg2bhSBIUlSIKwWA/BX9WfN2TEhF+ghfz7Q6i6DEqK0X9IKoxVrdvPeA
 B3wIUPm/vDW3KWl5UXTbzRwc35+KnNBBZFx06eifAIPoGxhRog7AqJXw1IWyee84
 i3wapvtnwvdjBdUzHRlOQ3233bBlH97UEZX9U4IxUnNUaCJq6gVUmwbVnVuP340m
 t271HbOY2itCMN+dM8MYfqxo4pBJIH42gH9odGDsXQet4Agk6UNWCWWRovJESHgN
 KSUewLvZNt8=
 =KaMD
 -----END PGP SIGNATURE-----

Merge tag 'iio-fixes-for-6.10c' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus

Jonathan writes:

IIO: 3rd round of fixes for 6.10

core:
- Trigger check on on whether a device was using own trigger was inverted.
avago,apds9306
- Checking wrong variable in an error check.

* tag 'iio-fixes-for-6.10c' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: light: apds9306: Fix error handing
  iio: trigger: Fix condition for own trigger
This commit is contained in:
Greg Kroah-Hartman 2024-07-03 16:16:45 +02:00
commit 0506794be2
2 changed files with 3 additions and 3 deletions

View File

@ -315,7 +315,7 @@ int iio_trigger_attach_poll_func(struct iio_trigger *trig,
* this is the case if the IIO device and the trigger device share the
* same parent device.
*/
if (iio_validate_own_trigger(pf->indio_dev, trig))
if (!iio_validate_own_trigger(pf->indio_dev, trig))
trig->attached_own_device = true;
return ret;

View File

@ -583,8 +583,8 @@ static int apds9306_intg_time_set(struct apds9306_data *data, int val2)
return ret;
intg_old = iio_gts_find_int_time_by_sel(&data->gts, intg_time_idx);
if (ret < 0)
return ret;
if (intg_old < 0)
return intg_old;
if (intg_old == val2)
return 0;