Commit 265f1ecf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'iio-fixes-for-6.3b' of...

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()
parents 09a9639e b1cb00d5
...@@ -1409,7 +1409,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *indio, ...@@ -1409,7 +1409,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *indio,
trig = devm_iio_trigger_alloc(&indio->dev, "%s-dev%d-%s", indio->name, trig = devm_iio_trigger_alloc(&indio->dev, "%s-dev%d-%s", indio->name,
iio_device_id(indio), trigger_name); iio_device_id(indio), trigger_name);
if (!trig) if (!trig)
return NULL; return ERR_PTR(-ENOMEM);
trig->dev.parent = indio->dev.parent; trig->dev.parent = indio->dev.parent;
iio_trigger_set_drvdata(trig, indio); iio_trigger_set_drvdata(trig, indio);
......
...@@ -802,6 +802,7 @@ static struct ad5755_platform_data *ad5755_parse_fw(struct device *dev) ...@@ -802,6 +802,7 @@ static struct ad5755_platform_data *ad5755_parse_fw(struct device *dev)
return pdata; return pdata;
error_out: error_out:
fwnode_handle_put(pp);
devm_kfree(dev, pdata); devm_kfree(dev, pdata);
return NULL; return NULL;
} }
......
...@@ -601,6 +601,7 @@ static int tsl2772_read_prox_diodes(struct tsl2772_chip *chip) ...@@ -601,6 +601,7 @@ static int tsl2772_read_prox_diodes(struct tsl2772_chip *chip)
return -EINVAL; return -EINVAL;
} }
} }
chip->settings.prox_diode = prox_diode_mask;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment