Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267524
b: refs/heads/master
c: 7a6ff01
h: refs/heads/master
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 5e6cb42 commit dacec02
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 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: deda386deb537dd2c8ec129bb53c1ffe57e827f7
refs/heads/master: 7a6ff010e5f423822145e728a57744e5d0f18e2f
23 changes: 11 additions & 12 deletions trunk/drivers/staging/iio/imu/adis16400_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ static int adis16400_spi_read_reg_16(struct iio_dev *indio_dev,
mutex_lock(&st->buf_lock);
st->tx[0] = ADIS16400_READ_REG(lower_reg_address);
st->tx[1] = 0;
st->tx[2] = 0;
st->tx[3] = 0;

spi_message_init(&msg);
spi_message_add_tail(&xfers[0], &msg);
Expand Down Expand Up @@ -240,17 +238,18 @@ static ssize_t adis16400_write_reset(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
bool val;
int ret;

if (len < 1)
return -1;
switch (buf[0]) {
case '1':
case 'y':
case 'Y':
return adis16400_reset(indio_dev);
}
return -1;
ret = strtobool(buf, &val);
if (ret < 0)
return ret;
if (val)
ret = adis16400_reset(dev_get_drvdata(dev));
if (ret < 0)
return ret;

return len;
}

int adis16400_set_irq(struct iio_dev *indio_dev, bool enable)
Expand Down

0 comments on commit dacec02

Please sign in to comment.