mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 21:52:04 +00:00
f407e2dca0
On machines with dual accelerometers described in a single ACPI fwnode,
the bmc150_accel_probe() instantiates a second i2c-client for the second
accelerometer.
A pointer to this manually instantiated second i2c-client is stored
inside the iio_dev's private-data through bmc150_set_second_device(),
so that the i2c-client can be unregistered from bmc150_accel_remove().
Before this commit bmc150_set_second_device() took only 1 argument so it
would store the pointer in private-data of the iio_dev belonging to the
manually instantiated i2c-client, leading to the bmc150_accel_remove()
call for the second_dev trying to unregister *itself* while it was
being removed, leading to a deadlock and rmmod hanging.
Change bmc150_set_second_device() to take 2 arguments: 1. The i2c-client
which is instantiating the second i2c-client for the 2nd accelerometer and
2. The second-device pointer itself (which also is an i2c-client).
This will store the second_device pointer in the private data of the
iio_dev belonging to the (ACPI instantiated) i2c-client for the first
accelerometer and will make bmc150_accel_remove() unregister the
second_device i2c-client when called for the first client,
avoiding the deadlock.
Fixes: 5bfb3a4bd8 ("iio: accel: bmc150: Check for a second ACPI device for BOSC0200")
Cc: Jeremy Cline <jeremy@jcline.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
26 lines
666 B
C
26 lines
666 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _BMC150_ACCEL_H_
|
|
#define _BMC150_ACCEL_H_
|
|
|
|
struct regmap;
|
|
|
|
enum {
|
|
bmc150,
|
|
bmi055,
|
|
bma255,
|
|
bma250e,
|
|
bma222,
|
|
bma222e,
|
|
bma280,
|
|
};
|
|
|
|
int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
|
|
const char *name, bool block_supported);
|
|
int bmc150_accel_core_remove(struct device *dev);
|
|
struct i2c_client *bmc150_get_second_device(struct i2c_client *second_device);
|
|
void bmc150_set_second_device(struct i2c_client *client, struct i2c_client *second_dev);
|
|
extern const struct dev_pm_ops bmc150_accel_pm_ops;
|
|
extern const struct regmap_config bmc150_regmap_conf;
|
|
|
|
#endif /* _BMC150_ACCEL_H_ */
|