diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-01-25 14:35:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-01-25 14:35:44 +1000 |
| commit | bc96ad6722f86a377ed2872c9a4854c90caf78ca (patch) | |
| tree | ece8859165a1faa10e4e2203d231fc7e87925139 /drivers/iio/dac/ad5504.c | |
| parent | d82afcf9caaac26ce2642511115bca9dacf30f41 (diff) | |
| parent | 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 (diff) | |
| download | linux-bc96ad6722f86a377ed2872c9a4854c90caf78ca.tar.gz | |
Merge tag 'v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge v5.11-rc5 into drm-next to clean up a bunch of conflicts we are dragging around.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/iio/dac/ad5504.c')
| -rw-r--r-- | drivers/iio/dac/ad5504.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 28921b62e642..e9297c25d4ef 100644 --- a/drivers/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c @@ -187,9 +187,9 @@ static ssize_t ad5504_write_dac_powerdown(struct iio_dev *indio_dev, return ret; if (pwr_down) - st->pwr_down_mask |= (1 << chan->channel); - else st->pwr_down_mask &= ~(1 << chan->channel); + else + st->pwr_down_mask |= (1 << chan->channel); ret = ad5504_spi_write(st, AD5504_ADDR_CTRL, AD5504_DAC_PWRDWN_MODE(st->pwr_down_mode) | |