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:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user