Skip to content

Commit

Permalink
staging:iio:adc:ad7291: reset device and setup irq before it is enabled
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
mhennerich authored and gregkh committed Sep 6, 2011
1 parent 06420c2 commit c11f02e
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions drivers/staging/iio/adc/ad7291.c
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,10 @@ static int __devinit ad7291_probe(struct i2c_client *client,
i2c_set_clientdata(client, indio_dev);

chip->client = client;
/* Tsense always enabled */
chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK;

chip->command = AD7291_NOISE_DELAY |
AD7291_T_SENSE_MASK | /* Tsense always enabled */
AD7291_ALERT_POLARITY; /* set irq polarity low level */

if (voltage_uv) {
chip->int_vref_mv = voltage_uv / 1000;
Expand All @@ -604,6 +606,18 @@ static int __devinit ad7291_probe(struct i2c_client *client,
indio_dev->info = &ad7291_info;
indio_dev->modes = INDIO_DIRECT_MODE;

ret = ad7291_i2c_write(chip, AD7291_COMMAND, AD7291_RESET);
if (ret) {
ret = -EIO;
goto error_disable_reg;
}

ret = ad7291_i2c_write(chip, AD7291_COMMAND, chip->command);
if (ret) {
ret = -EIO;
goto error_disable_reg;
}

if (client->irq > 0) {
ret = request_threaded_irq(client->irq,
NULL,
Expand All @@ -613,15 +627,6 @@ static int __devinit ad7291_probe(struct i2c_client *client,
indio_dev);
if (ret)
goto error_disable_reg;

/* set irq polarity low level */
chip->command |= AD7291_ALERT_POLARITY;
}

ret = ad7291_i2c_write(chip, AD7291_COMMAND, chip->command);
if (ret) {
ret = -EIO;
goto error_unreg_irq;
}

ret = iio_device_register(indio_dev);
Expand Down

0 comments on commit c11f02e

Please sign in to comment.