Merge tag 'iio-for-4.12d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes: Fourth set of IIO new device support, features and cleanups for the 4.12 cycle New device support * max1117, 1118 and 1119 - new ADC driver * max9611 - new ADC driver * pm8xxx hk/xoadc - new driver with some shared features broken out from the SPMI vadc. * sun4i-gpadc - A33 thermal sensor support (with associated rework) * stm32-dac - new driver and bindings * stm32 trigger - enable support of quadrature encoder device and counter modes Features * apds9960 - use the runtime pm for normal suspend * stm32-adc - add opition to sest resolution via devicetree * xoadc - augment DT bindings to deal with some weird mux cases Cleanups * ad5933 - protect direct mode using claim and release helpers * ade7759 - S_IRUGO and friends to octal in two goes * adis16203 - drop unnecessary brackets * hid-sensor - fix unbalanced pm_runtieme_enable error when probing after remove * lsm6dsx - use actual part numbers for device name when known - simplify data read pin parsing * mpu3050 - avoid double reporting errors
This commit is contained in:
@@ -70,9 +70,8 @@ static int mpu3050_i2c_probe(struct i2c_client *client,
|
||||
dev_err(&client->dev, "failed to allocate I2C mux\n");
|
||||
else {
|
||||
mpu3050->i2cmux->priv = mpu3050;
|
||||
ret = i2c_mux_add_adapter(mpu3050->i2cmux, 0, 0, 0);
|
||||
if (ret)
|
||||
dev_err(&client->dev, "failed to add I2C mux\n");
|
||||
/* Ignore failure, not critical */
|
||||
i2c_mux_add_adapter(mpu3050->i2cmux, 0, 0, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user