Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / iio / accel / adxl367.c

diff --git a/drivers/iio/accel/adxl367.c b/drivers/iio/accel/adxl367.c
index 834ee6d..210228a 100644 (file)
--- a/drivers/iio/accel/adxl367.c
+++ b/drivers/iio/accel/adxl367.c
@@ -1368,9 +1368,11 @@ static int adxl367_verify_devid(struct adxl367_state *st)
        unsigned int val;
        int ret;
 
-       ret = regmap_read_poll_timeout(st->regmap, ADXL367_REG_DEVID, val,
-                                      val == ADXL367_DEVID_AD, 1000, 10000);
+       ret = regmap_read(st->regmap, ADXL367_REG_DEVID, &val);
        if (ret)
+               return dev_err_probe(st->dev, ret, "Failed to read dev id\n");
+
+       if (val != ADXL367_DEVID_AD)
                return dev_err_probe(st->dev, -ENODEV,
                                     "Invalid dev id 0x%02X, expected 0x%02X\n",
                                     val, ADXL367_DEVID_AD);
@@ -1449,6 +1451,8 @@ int adxl367_probe(struct device *dev, const struct adxl367_ops *ops,
        if (ret)
                return ret;
 
+       fsleep(15000);
+
        ret = adxl367_verify_devid(st);
        if (ret)
                return ret;