forked from luck/tmp_suning_uos_patched
a2c17c93b7
[ Upstream commit 9f0b3e0cc0c88618aa9e5cecef747b1337ae0a5d ] Up until commitea7e586bdd("iio: st_sensors: move regulator retrieveal to core") only the ST pressure driver seems to have had any regulator disable. After that commit, the regulator handling was moved into the common st_sensors logic. In all instances of this regulator handling, the regulators were disabled before unregistering the IIO device. This can cause issues where the device would be powered down and still be available to userspace, allowing it to send invalid/garbage data. This change moves the st_sensors_power_disable() after the common probe functions. These common probe functions also handle unregistering the IIO device. Fixes:774487611c("iio: pressure-core: st: Provide support for the Vdd power supply") Fixes:ea7e586bdd("iio: st_sensors: move regulator retrieveal to core") Cc: Lee Jones <lee.jones@linaro.org> Cc: Denis CIOCCA <denis.ciocca@st.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com> Link: https://lore.kernel.org/r/20210823112204.243255-2-aardelean@deviqon.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
134 lines
2.9 KiB
C
134 lines
2.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* STMicroelectronics magnetometers driver
|
|
*
|
|
* Copyright 2012-2013 STMicroelectronics Inc.
|
|
*
|
|
* Denis Ciocca <denis.ciocca@st.com>
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/iio/iio.h>
|
|
|
|
#include <linux/iio/common/st_sensors.h>
|
|
#include <linux/iio/common/st_sensors_i2c.h>
|
|
#include "st_magn.h"
|
|
|
|
static const struct of_device_id st_magn_of_match[] = {
|
|
{
|
|
.compatible = "st,lsm303dlh-magn",
|
|
.data = LSM303DLH_MAGN_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm303dlhc-magn",
|
|
.data = LSM303DLHC_MAGN_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm303dlm-magn",
|
|
.data = LSM303DLM_MAGN_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lis3mdl-magn",
|
|
.data = LIS3MDL_MAGN_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm303agr-magn",
|
|
.data = LSM303AGR_MAGN_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lis2mdl",
|
|
.data = LIS2MDL_MAGN_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm9ds1-magn",
|
|
.data = LSM9DS1_MAGN_DEV_NAME,
|
|
},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, st_magn_of_match);
|
|
|
|
static int st_magn_i2c_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
const struct st_sensor_settings *settings;
|
|
struct st_sensor_data *mdata;
|
|
struct iio_dev *indio_dev;
|
|
int err;
|
|
|
|
st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name));
|
|
|
|
settings = st_magn_get_settings(client->name);
|
|
if (!settings) {
|
|
dev_err(&client->dev, "device name %s not recognized.\n",
|
|
client->name);
|
|
return -ENODEV;
|
|
}
|
|
|
|
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));
|
|
if (!indio_dev)
|
|
return -ENOMEM;
|
|
|
|
mdata = iio_priv(indio_dev);
|
|
mdata->sensor_settings = (struct st_sensor_settings *)settings;
|
|
|
|
err = st_sensors_i2c_configure(indio_dev, client);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = st_sensors_power_enable(indio_dev);
|
|
if (err)
|
|
return err;
|
|
|
|
err = st_magn_common_probe(indio_dev);
|
|
if (err < 0)
|
|
goto st_magn_power_off;
|
|
|
|
return 0;
|
|
|
|
st_magn_power_off:
|
|
st_sensors_power_disable(indio_dev);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int st_magn_i2c_remove(struct i2c_client *client)
|
|
{
|
|
struct iio_dev *indio_dev = i2c_get_clientdata(client);
|
|
|
|
st_magn_common_remove(indio_dev);
|
|
|
|
st_sensors_power_disable(indio_dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct i2c_device_id st_magn_id_table[] = {
|
|
{ LSM303DLH_MAGN_DEV_NAME },
|
|
{ LSM303DLHC_MAGN_DEV_NAME },
|
|
{ LSM303DLM_MAGN_DEV_NAME },
|
|
{ LIS3MDL_MAGN_DEV_NAME },
|
|
{ LSM303AGR_MAGN_DEV_NAME },
|
|
{ LIS2MDL_MAGN_DEV_NAME },
|
|
{ LSM9DS1_MAGN_DEV_NAME },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, st_magn_id_table);
|
|
|
|
static struct i2c_driver st_magn_driver = {
|
|
.driver = {
|
|
.name = "st-magn-i2c",
|
|
.of_match_table = st_magn_of_match,
|
|
},
|
|
.probe = st_magn_i2c_probe,
|
|
.remove = st_magn_i2c_remove,
|
|
.id_table = st_magn_id_table,
|
|
};
|
|
module_i2c_driver(st_magn_driver);
|
|
|
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
|
MODULE_DESCRIPTION("STMicroelectronics magnetometers i2c driver");
|
|
MODULE_LICENSE("GPL v2");
|