diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-06 12:34:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-06 12:34:41 +0100 |
| commit | 113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6 (patch) | |
| tree | 90505c4418561b98f773e5f7b549399e2868c239 /drivers/iio/light/ltr501.c | |
| parent | c3879956957b8de9fd6cbad604e668fd00c6506c (diff) | |
| parent | 996034b117b467709dec7811ef134063934fa626 (diff) | |
| download | talos-op-linux-113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6.tar.gz talos-op-linux-113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6.zip | |
Merge tag 'asoc-fix-v4.2-rc3' into asoc-fix-topology
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'drivers/iio/light/ltr501.c')
| -rw-r--r-- | drivers/iio/light/ltr501.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c index 1ef7d3773ab9..b5a0e66b5f28 100644 --- a/drivers/iio/light/ltr501.c +++ b/drivers/iio/light/ltr501.c @@ -1302,7 +1302,7 @@ static int ltr501_init(struct ltr501_data *data) if (ret < 0) return ret; - data->als_contr = ret | data->chip_info->als_mode_active; + data->als_contr = status | data->chip_info->als_mode_active; ret = regmap_read(data->regmap, LTR501_PS_CONTR, &status); if (ret < 0) |
