| Message ID | cd02d632857c0c1e351c86cfe58af023d75c6e86.1530268235.git.nikolaus.voss@loewensteinmedical.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c index b81e48e9f27e..0c1a77f9b08c 100644 --- a/drivers/iio/common/st_sensors/st_sensors_i2c.c +++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c @@ -87,10 +87,9 @@ int st_sensors_match_acpi_device(struct device *dev) if (ACPI_HANDLE(dev)) { acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); - if (!acpi_id) { - dev_err(dev, "No driver data\n"); + if (!acpi_id) return -EINVAL; - } + driver_data = acpi_id->driver_data; } return driver_data;
If there is a ACPI node for a i2c device but HID/CID doesn't match, there could still be a ACPI_DT_NAMESPACE_HID / PRP0001 HID entry which is matched against the i2c device ID table, so don't print an error message. Signed-off-by: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> --- drivers/iio/common/st_sensors/st_sensors_i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)