Commit 0506794b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-6.10c' of... 

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
parents 22a40d14 1a5cba43

drivers/iio/industrialio-trigger.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iio/light/apds9306.c

+2 −2
Original line number Diff line number Diff line
@@ -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;