Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317204
b: refs/heads/master
c: 3bbbf15
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent 71ad49c commit a3bc8f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 159fe695ae2ad53b915465f30ddd0fbc7f014900
refs/heads/master: 3bbbf150ffde2ca48249537d2d9e4b52bc0a5fc8
10 changes: 4 additions & 6 deletions trunk/drivers/staging/iio/dac/ad5504.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,20 +147,18 @@ static ssize_t ad5504_write_dac_powerdown(struct iio_dev *indio_dev,
uintptr_t private, const struct iio_chan_spec *chan, const char *buf,
size_t len)
{
long readin;
bool pwr_down;
int ret;
struct ad5504_state *st = iio_priv(indio_dev);

ret = strict_strtol(buf, 10, &readin);
ret = strtobool(buf, &pwr_down);
if (ret)
return ret;

if (readin == 0)
if (pwr_down)
st->pwr_down_mask |= (1 << chan->channel);
else if (readin == 1)
st->pwr_down_mask &= ~(1 << chan->channel);
else
ret = -EINVAL;
st->pwr_down_mask &= ~(1 << chan->channel);

ret = ad5504_spi_write(st->spi, AD5504_ADDR_CTRL,
AD5504_DAC_PWRDWN_MODE(st->pwr_down_mode) |
Expand Down

0 comments on commit a3bc8f4

Please sign in to comment.