Merge tag 's390-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

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

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 2edfcb4..d8a454c 100644 (file)
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -658,7 +658,7 @@ static const struct iio_chan_spec_ext_info bma023_ext_info[] = {
 
 static const struct iio_chan_spec_ext_info bma180_ext_info[] = {
        IIO_ENUM("power_mode", IIO_SHARED_BY_TYPE, &bma180_power_mode_enum),
-       IIO_ENUM_AVAILABLE("power_mode", &bma180_power_mode_enum),
+       IIO_ENUM_AVAILABLE("power_mode", IIO_SHARED_BY_TYPE, &bma180_power_mode_enum),
        IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bma180_accel_get_mount_matrix),
        { }
 };
@@ -938,7 +938,7 @@ static int bma180_probe(struct i2c_client *client,
        i2c_set_clientdata(client, indio_dev);
        data->client = client;
        if (client->dev.of_node)
-               chip = (enum chip_ids)of_device_get_match_data(dev);
+               chip = (uintptr_t)of_device_get_match_data(dev);
        else
                chip = id->driver_data;
        data->part_info = &bma180_part_info[chip];