Skip to content

Commit 265f1ec

Browse files
committed
Merge tag 'iio-fixes-for-6.3b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus
Jonathan writes: 2nd set of IIO fixes for the 6.3 cycle. adi,ad5755 - Fix missing fwnode_handle_put() in error path. atmel,at91-sam5d2 - Fix error code when trigger allocation fails that would have looked like success. taos,tsl2772 - Store the proximity-diodes value read from the device tree so it is actually used rather than ignored. * tag 'iio-fixes-for-6.3b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: iio: light: tsl2772: fix reading proximity-diodes from device tree iio: dac: ad5755: Add missing fwnode_handle_put() iio: adc: at91-sama5d2_adc: fix an error code in at91_adc_allocate_trigger()
2 parents 09a9639 + b1cb00d commit 265f1ec

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

drivers/iio/adc/at91-sama5d2_adc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *indio,
14091409
trig = devm_iio_trigger_alloc(&indio->dev, "%s-dev%d-%s", indio->name,
14101410
iio_device_id(indio), trigger_name);
14111411
if (!trig)
1412-
return NULL;
1412+
return ERR_PTR(-ENOMEM);
14131413

14141414
trig->dev.parent = indio->dev.parent;
14151415
iio_trigger_set_drvdata(trig, indio);

drivers/iio/dac/ad5755.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,7 @@ static struct ad5755_platform_data *ad5755_parse_fw(struct device *dev)
802802
return pdata;
803803

804804
error_out:
805+
fwnode_handle_put(pp);
805806
devm_kfree(dev, pdata);
806807
return NULL;
807808
}

drivers/iio/light/tsl2772.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ static int tsl2772_read_prox_diodes(struct tsl2772_chip *chip)
601601
return -EINVAL;
602602
}
603603
}
604+
chip->settings.prox_diode = prox_diode_mask;
604605

605606
return 0;
606607
}

0 commit comments

Comments
 (0)